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 2015/11/30 22:37:04 UTC

incubator-tinkerpop git commit: Used GraphSONTokens where they should have been used

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/TINKERPOP3-978 820297ef8 -> 876076110


Used GraphSONTokens where they should have been used


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

Branch: refs/heads/TINKERPOP3-978
Commit: 87607611042152a1c02e029cbde78e89ebe22f5c
Parents: 820297e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 30 16:36:16 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Nov 30 16:36:16 2015 -0500

----------------------------------------------------------------------
 .../gremlin/tinkergraph/structure/TinkerIoRegistry.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/87607611/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
index 60cebe6..abdef24 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
@@ -233,8 +233,8 @@ public final class TinkerIoRegistry extends AbstractIoRegistry {
                 edges = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
             } else {
                 final Map<String, Object> graphData = deserializationContext.readValue(jsonParser, HashMap.class);
-                vertices = (List<Map<String,Object>>) graphData.get("vertices");
-                edges = (List<Map<String,Object>>) graphData.get("edges");
+                vertices = (List<Map<String,Object>>) graphData.get(GraphSONTokens.VERTICES);
+                edges = (List<Map<String,Object>>) graphData.get(GraphSONTokens.EDGES);
             }
 
             for (Map<String, Object> vertexData : vertices) {