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/04/22 22:39:00 UTC
[1/2] incubator-tinkerpop git commit: Used IteratorUtils.list()
instead of IteratorUtils.fill()
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master f7073a541 -> 400f6eaf4
Used IteratorUtils.list() instead of IteratorUtils.fill()
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eaa595d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eaa595d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eaa595d1
Branch: refs/heads/master
Commit: eaa595d1b6df208b9af1a01737bab00d5677e3bb
Parents: 31d0286
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 22 16:38:05 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 22 16:38:05 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eaa595d1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java
index 2444570..2b26ac3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java
@@ -81,11 +81,11 @@ class GraphSONVertex {
m.put(GraphSONTokens.PROPERTIES, properties);
if (directionalVertex.getDirection() == Direction.BOTH || directionalVertex.getDirection() == Direction.OUT) {
- m.put(GraphSONTokens.OUT_E, IteratorUtils.fill(vertex.edges(Direction.OUT), new ArrayList()));
+ m.put(GraphSONTokens.OUT_E, IteratorUtils.list(vertex.edges(Direction.OUT)));
}
if (directionalVertex.getDirection() == Direction.BOTH || directionalVertex.getDirection() == Direction.IN) {
- m.put(GraphSONTokens.IN_E, IteratorUtils.fill(vertex.edges(Direction.IN), new ArrayList()));
+ m.put(GraphSONTokens.IN_E, IteratorUtils.list(vertex.edges(Direction.IN)));
}
jsonGenerator.writeObject(m);
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/400f6eaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/400f6eaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/400f6eaf
Branch: refs/heads/master
Commit: 400f6eaf4c4c1191c4cf87edb9ee377b3816fb0d
Parents: eaa595d f7073a5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 22 16:38:53 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 22 16:38:53 2015 -0400
----------------------------------------------------------------------
.../util/star/StarGraphSerializer.java | 31 ++++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------