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 2015/05/29 00:50:07 UTC
incubator-tinkerpop git commit: simplified mixElementIds test method.
dar.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/neo4j-gremlin-apache 47f513070 -> 68185c866
simplified mixElementIds test method. dar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/68185c86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/68185c86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/68185c86
Branch: refs/heads/neo4j-gremlin-apache
Commit: 68185c86658b9414c7fbde17141222f5676b644f
Parents: 47f5130
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu May 28 16:50:19 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu May 28 16:50:19 2015 -0600
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/util/ElementHelper.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/68185c86/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
index f5b4f68..b5aa7f3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
@@ -89,10 +89,7 @@ public final class ElementHelper {
if (ids.length > 1) {
final boolean element = clazz.isAssignableFrom(ids[0].getClass());
for (int i = 1; i < ids.length; i++) {
- final boolean assignable = clazz.isAssignableFrom(ids[i].getClass());
- if (assignable && !element)
- throw Graph.Exceptions.idArgsMustBeEitherIdOrElement();
- else if (!assignable && element)
+ if (clazz.isAssignableFrom(ids[i].getClass()) != element)
throw Graph.Exceptions.idArgsMustBeEitherIdOrElement();
}
}