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/05/26 19:24:36 UTC

incubator-tinkerpop git commit: Add check of other exception that seems to throw from LifeCycleHook.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 4c0674c5e -> 2debc9272


Add check of other exception that seems to throw from LifeCycleHook.

Prints an ugly stacktrace on shutdown if this exception isn't caught.


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

Branch: refs/heads/master
Commit: 2debc9272c5b9afe7b4160a0c24a221939624b45
Parents: 4c0674c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 26 13:23:20 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 26 13:24:23 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2debc927/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 175fcdb..0d31d65 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -269,7 +270,7 @@ public class GremlinServer {
                 logger.info("Executing shutdown {}", LifeCycleHook.class.getSimpleName());
                 try {
                     hook.onShutDown(new LifeCycleHook.Context(logger));
-                } catch (UnsupportedOperationException uoe) {
+                } catch (UnsupportedOperationException | UndeclaredThrowableException  uoe) {
                     // if the user doesn't implement onShutDown the scriptengine will throw
                     // this exception.  it can safely be ignored.
                 }