You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/07/08 20:37:50 UTC

[03/11] incubator-tinkerpop git commit: Fix compile errors after merge.

Fix compile errors after merge.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/569ef03a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/569ef03a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/569ef03a

Branch: refs/heads/compiler-customizer
Commit: 569ef03a0042342a659d9bac19738e6ed46c04a4
Parents: 0e1c86b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 8 11:56:30 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 8 11:56:30 2015 -0400

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java   | 5 ++---
 .../gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/569ef03a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java
index 5ff4494..3e884ae 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java
@@ -345,9 +345,8 @@ public class ScriptEngines implements AutoCloseable {
             final long interruptionTimeout = ((Number) config.getOrDefault("interruptionTimeout",
                     GremlinGroovyScriptEngine.DEFAULT_SCRIPT_EVALUATION_TIMEOUT)).longValue();
 
-            return Optional.of((ScriptEngine) new GremlinGroovyScriptEngine(
-                    new DefaultImportCustomizerProvider(imports, staticImports), securityCustomizerProvider,
-                    interruptionTimeout));
+            return Optional.of((ScriptEngine) new GremlinGroovyScriptEngine(interruptionTimeout,
+                    new DefaultImportCustomizerProvider(imports, staticImports), securityCustomizerProvider));
         } else {
             return Optional.ofNullable(SCRIPT_ENGINE_MANAGER.getEngineByName(language));
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/569ef03a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index 2bdbda3..ee6abe9 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -335,7 +335,7 @@ public class GremlinGroovyScriptEngineTest {
 
     @Test
     public void shouldContinueToEvalScriptsEvenWithTimedInterrupt() throws Exception {
-        final ScriptEngine engine = new GremlinGroovyScriptEngine(new DefaultImportCustomizerProvider(), null, 50);
+        final ScriptEngine engine = new GremlinGroovyScriptEngine(50, new DefaultImportCustomizerProvider());
 
         for (int ix = 0; ix < 10; ix++) {
             try {