Merge branch '3.7-dev'

apache · Jun 19, 2024 · 9bddde4 · 9bddde4
2 parents bb4fccd + dc6e715
commit 9bddde4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -351,6 +351,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.6.8 (NOT OFFICIALLY RELEASED YET)
 
 * Fixed bug in Java driver where connection pool was not removing dead connections under certain error conditions.
+* Raised handshake exceptions for Java driver for `NoHostAvailableException` situations.
 
 [[release-3-6-7]]
 === TinkerPop 3.6.7 (April 8, 2024)

diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
+import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.slf4j.Logger;
@@ -557,7 +558,8 @@ protected void initializeImplementation() {
         private void throwNoHostAvailableException() {
             final Throwable rootCause = ExceptionUtils.getRootCause(initializationFailure);
             // allow the certain exceptions to propagate as a cause
-            if (rootCause instanceof SSLException || rootCause instanceof ConnectException) {
+            if (rootCause instanceof SSLException || rootCause instanceof ConnectException ||
+                    rootCause instanceof WebSocketClientHandshakeException) {
                 throw new NoHostAvailableException(initializationFailure);
             } else {
                 throw new NoHostAvailableException();