You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/01/13 15:18:42 UTC

incubator-tinkerpop git commit: TrueTraversal was an INSTANCE static, but this was causing problems as AbstractLambdaTraversal had dynamic strategies. To rectify the situation, no more INSTANCE. CTR.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 869c0d174 -> 77af1a030


TrueTraversal was an INSTANCE static, but this was causing problems as AbstractLambdaTraversal had dynamic strategies. To rectify the situation, no more INSTANCE. CTR.


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

Branch: refs/heads/master
Commit: 77af1a030f581eddbf9298b121e8ef53772d3474
Parents: 869c0d1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jan 13 07:18:28 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jan 13 07:18:37 2016 -0700

----------------------------------------------------------------------
 .../process/traversal/dsl/graph/GraphTraversal.java     |  2 +-
 .../gremlin/process/traversal/lambda/TrueTraversal.java | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77af1a03/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 488298f..712c893 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1120,7 +1120,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     }
 
     public default GraphTraversal<S, E> emit() {
-        return this.emit(TrueTraversal.instance());
+        return this.emit(new TrueTraversal<>());
     }
 
     public default GraphTraversal<S, E> until(final Traversal<?, ?> untilTraversal) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77af1a03/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java
index c07000e..46d3755 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java
@@ -23,8 +23,6 @@ package org.apache.tinkerpop.gremlin.process.traversal.lambda;
  */
 public final class TrueTraversal<S, E> extends AbstractLambdaTraversal<S, E> {
 
-    private static final TrueTraversal INSTANCE = new TrueTraversal<>();
-
     @Override
     public boolean hasNext() {
         return true;
@@ -36,14 +34,8 @@ public final class TrueTraversal<S, E> extends AbstractLambdaTraversal<S, E> {
     }
 
     @Override
-    @SuppressWarnings("CloneDoesntCallSuperClone")
-    public TrueTraversal<S, E> clone() {
-        return INSTANCE;
-    }
-
-    public static <A, B> TrueTraversal<A, B> instance() {
-        return INSTANCE;
+    public int hashCode() {
+        return this.getClass().hashCode();
     }
 
-
 }