accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjno...@apache.org
Subject accumulo git commit: ACCUMULO-3433 Inconsistent serialVersionId causing unit to fail
Date Thu, 18 Dec 2014 04:47:32 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.2-SNAPSHOT f10913bab -> eef9f1490


ACCUMULO-3433 Inconsistent serialVersionId causing unit to fail


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eef9f149
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eef9f149
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eef9f149

Branch: refs/heads/1.6.2-SNAPSHOT
Commit: eef9f1490efb78c452d5a6ddff08cd3e82b1d168
Parents: f10913b
Author: Corey J. Nolet <cjnolet@gmail.com>
Authored: Wed Dec 17 23:46:50 2014 -0500
Committer: Corey J. Nolet <cjnolet@gmail.com>
Committed: Wed Dec 17 23:46:50 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/trace/thrift/TInfo.java | 35 ++++++--------------
 1 file changed, 10 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eef9f149/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
index 1046149..e7bbfaa 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
@@ -22,40 +22,25 @@
  */
 package org.apache.accumulo.trace.thrift;
 
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-
 import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("all") public class TInfo implements org.apache.thrift.TBase<TInfo,
TInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TInfo> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInfo");
 
-  //ACCUMULO-3132
-  //Total hack around the serialization of TInfo into zookeeper
   private static final long serialVersionUID = -4659975753252858243l;
 
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInfo");
-
   private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceId",
org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentId",
org.apache.thrift.protocol.TType.I64, (short)2);
 


Mime
View raw message