Repository: tinkerpop Updated Branches: refs/heads/tp32 6a6959a33 -> 675c07717
Do not format and reparse eval timeout arg when evaluating request. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/720d181b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/720d181b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/720d181b Branch: refs/heads/tp32 Commit: 720d181b1b1b68e4b4dbcd10c8aabdfcfc58a3be Parents: ea18963 Author: Kevin Gallardo <kevin.galla...@datastax.com> Authored: Tue Aug 14 14:59:20 2018 -0400 Committer: Kevin Gallardo <kevin.galla...@datastax.com> Committed: Tue Aug 14 14:59:20 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 5 +++-- .../gremlin/server/op/traversal/TraversalOpProcessor.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/720d181b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java index ca1ee53..78ae6a1 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java @@ -266,8 +266,9 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor { true : (Boolean) args.getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false); // timeout override - final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ? - Long.parseLong(args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : settings.scriptEvaluationTimeout; + final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) + ? (long) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) + : settings.scriptEvaluationTimeout; final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build() .scriptEvaluationTimeoutOverride(seto) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/720d181b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java index 0168cba..ea8752f 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java @@ -353,8 +353,9 @@ public class TraversalOpProcessor extends AbstractOpProcessor { final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get(); // timeout override - final long seto = msg.getArgs().containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ? - Long.parseLong(msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : context.getSettings().scriptEvaluationTimeout; + final long seto = msg.getArgs().containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) + ? (long) msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) + : context.getSettings().scriptEvaluationTimeout; final GraphManager graphManager = context.getGraphManager(); final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
