You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/19 22:29:00 UTC
git commit: ACCUMUL-2056 work around HostAndPort not being
serializable
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 674fa95ca -> f0ea80a11
ACCUMUL-2056 work around HostAndPort not being serializable
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f0ea80a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f0ea80a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f0ea80a1
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f0ea80a1127db82ea7ea3eab42599e354bd3a1ac
Parents: 674fa95
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 19 16:29:03 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 19 16:29:03 2013 -0500
----------------------------------------------------------------------
.../server/master/state/TServerInstance.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f0ea80a1/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
index 54d7e71..e7dce67 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
@@ -16,6 +16,9 @@
*/
package org.apache.accumulo.server.master.state;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import org.apache.accumulo.core.data.Mutation;
@@ -35,7 +38,8 @@ public class TServerInstance implements Comparable<TServerInstance>, Serializabl
private static final long serialVersionUID = 1L;
- private HostAndPort location;
+ // HostAndPort is not Serializable
+ private transient HostAndPort location;
private String session;
private String cachedStringRepresentation;
@@ -125,4 +129,14 @@ public class TServerInstance implements Comparable<TServerInstance>, Serializabl
public String getSession() {
return session;
}
+
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ out.writeObject(location.toString());
+ }
+
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ location = HostAndPort.fromString(in.readObject().toString());
+ }
}