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 2017/01/10 17:34:38 UTC
[3/4] tinkerpop git commit: dah. sorry. last minute change without
mvn clean insatll -- AND should be OR
dah. sorry. last minute change without mvn clean insatll -- AND should be OR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ca1c585
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ca1c585
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ca1c585
Branch: refs/heads/tp32
Commit: 9ca1c5857a194801ed9538dea8d8fef0bc918da0
Parents: bdd1924
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jan 9 09:52:35 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jan 9 09:52:35 2017 -0700
----------------------------------------------------------------------
.../traversal/strategy/optimization/PathRetractionStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ca1c585/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
index b5992a5..fcc22a4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
@@ -110,7 +110,7 @@ public final class PathRetractionStrategy extends AbstractTraversalStrategy<Trav
!(currentStep instanceof Barrier) &&
!(currentStep.getNextStep() instanceof Barrier) &&
!(currentStep.getTraversal().getParent() instanceof MatchStep) &&
- (currentStep.getNextStep() instanceof EmptyStep && TraversalHelper.isGlobalChild(currentStep.getTraversal())))
+ (!(currentStep.getNextStep() instanceof EmptyStep) || TraversalHelper.isGlobalChild(currentStep.getTraversal())))
TraversalHelper.insertAfterStep(new NoOpBarrierStep<>(traversal, this.standardBarrierSize), currentStep, traversal);
}
}