You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/12/20 20:25:47 UTC

[29/47] tinkerpop git commit: Changed Gryo registration ids to avoid conflict in 3.3.x

Changed Gryo registration ids to avoid conflict in 3.3.x

Ensures better compatibility if we jump to 161 as the next available Gryo type registration id as 3.3.0 has already advanced the identifiers. CTR


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

Branch: refs/heads/TINKERPOP-1130
Commit: 73b2d65bd11ffe5dc01e0887da7dae78fc7a1f82
Parents: 651b0f3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 14:33:21 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 14:33:21 2016 -0500

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/73b2d65b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index 60ed74e..cece932 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -286,9 +286,9 @@ public final class GryoMapper implements Mapper<Kryo> {
                 add(GryoTypeReg.of(VertexTerminator.class, 13));
                 add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
                 add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
-                add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
-                add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
-                add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer()));  // ***LAST ID***
+                add(GryoTypeReg.of(java.sql.Timestamp.class, 161));
+                add(GryoTypeReg.of(InetAddress.class, 162, new UtilSerializers.InetAddressSerializer()));
+                add(GryoTypeReg.of(ByteBuffer.class, 163, new UtilSerializers.ByteBufferSerializer()));  // ***LAST ID***
 
                 add(GryoTypeReg.of(ReferenceEdge.class, 81));
                 add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));