You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/24 21:43:33 UTC
[3/3] incubator-tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Resolved Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2b3b96c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2b3b96c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2b3b96c6
Branch: refs/heads/master
Commit: 2b3b96c6e4a9dca572b16b33ec74fcb26e0bc488
Parents: 664d530 80f3119
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 24 21:42:40 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 24 21:42:40 2015 +0200
----------------------------------------------------------------------
.../console/commands/PluginCommand.groovy | 6 +-
.../console/commands/PluginCommand.properties | 2 +-
.../traversal/dsl/graph/GraphTraversal.java | 5 +
.../gremlin/process/traversal/dsl/graph/__.java | 4 +
.../step/filter/WhereTraversalStep.java | 2 +-
.../process/traversal/step/map/MatchStep.java | 121 +++++++++++++------
.../traversal/step/sideEffect/StartStep.java | 6 +-
.../decoration/ConjunctionStrategy.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../traversal/step/map/GroovyMatchTest.groovy | 17 ++-
.../process/traversal/step/map/MatchTest.java | 18 +++
11 files changed, 132 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2b3b96c6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
index c2d92aa,cb6b36d..48ae008
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
@@@ -61,7 -60,7 +61,7 @@@ public final class ConjunctionStrategy
}
private static boolean legalCurrentStep(final Step<?, ?> step) {
- return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !((StartStep) step).isVariableStartStep()));
- return !(step instanceof EmptyStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
++ return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
}
private static void processConjunctionMarkers(final Traversal.Admin<?, ?> traversal) {