[tinkerpop] branch master updated: Handle close message in UnifiedHandler

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new fa8f255  Handle close message in UnifiedHandler
fa8f255 is described below

commit fa8f25558118bae0745f7712eccb9c8b7545f1a9
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Dec 20 13:26:53 2021 -0500

    Handle close message in UnifiedHandler
    
    This message just needs to be trapped becuase drivers started sending it again in 3.5.2, but it has no function in this context. CTR
---
 .../org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java   | 2 +-
 .../org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
index ed63dc6..ad0caa0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
@@ -239,7 +239,7 @@ public abstract class AbstractSession implements Session, AutoCloseable {
                     if (sessionThread != null) {
                         sessionThread.interrupt();
                     } else {
-                        logger.debug("{} is a {} which is not interruptable as the thread running the session has not " +
+                        logger.debug("{} is a {} which cannot be interrupted as the thread running the session has not " +
                                         "been set - please check the implementation if this is not desirable",
                                 sessionId, this.getClass().getSimpleName());
                     }
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
index a5313ed..3ccae44 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
@@ -136,6 +136,9 @@ public class UnifiedHandler extends SimpleChannelInboundHandler<RequestMessage>
                 return;
             }
 
+            // ignore the close session message from older versions of the protocol
+            if (msg.getOp().equals(Tokens.OPS_CLOSE)) return;
+
             final Optional<String> optMultiTaskSession = msg.optionalArgs(Tokens.ARGS_SESSION);
             final String sessionId = optMultiTaskSession.orElse(msg.getRequestId().toString());