TINKERPOP-1595 Refactored reflective lookups for clone() Rather than iterate all methods to find clone() just call getMethod() and call that if found. Nothing seems to be exercising this bit of code in our test suite. I forced it by adding clone() temporarily to RangeBiOperator and it worked without issue. Not sure how else to test this.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a5d9ecd0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a5d9ecd0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a5d9ecd0 Branch: refs/heads/tp32 Commit: a5d9ecd03130b2615916b5659e5d5b3e11bedc2f Parents: 55c6fb5 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Apr 24 08:03:28 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon May 21 12:32:57 2018 -0400 ---------------------------------------------------------------------- .../gremlin/process/computer/MemoryComputeKey.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5d9ecd0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MemoryComputeKey.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MemoryComputeKey.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MemoryComputeKey.java index 70adf3d..a9b1532 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MemoryComputeKey.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MemoryComputeKey.java @@ -79,14 +79,17 @@ public final class MemoryComputeKey<A> implements Serializable, Cloneable { public MemoryComputeKey<A> clone() { try { final MemoryComputeKey<A> clone = (MemoryComputeKey<A>) super.clone(); - for (final Method method : this.reducer.getClass().getMethods()) { - if (method.getName().equals("clone") && 0 == method.getParameterCount()) { - clone.reducer = (BinaryOperator<A>) method.invoke(this.reducer); - break; - } + + try { + final Method cloneMethod = this.reducer.getClass().getMethod("clone"); + if (cloneMethod != null) + clone.reducer = (BinaryOperator<A>) cloneMethod.invoke(this.reducer); + } catch(Exception ignored) { + } + return clone; - } catch (final IllegalAccessException | InvocationTargetException | CloneNotSupportedException e) { + } catch (final CloneNotSupportedException e) { throw new IllegalStateException(e.getMessage(), e); } }
