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 2021/10/05 13:44:50 UTC
[tinkerpop] branch master updated (432f668 -> e7c8899)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 432f668 Merge branch '3.5-dev'
add 76fc5ba Retain failure context in NoHostAvailableException
add bfdffc5 Merge branch 'pr-1479' into 3.5-dev
add abe0b0d TINKERPOP-2616 Added upgrade docs for ssl exception changes CTR
new a3c3830 Merge branch '3.5-dev'
new e7c8899 Changed assertion for SSL error.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 10 ++++
.../apache/tinkerpop/gremlin/driver/Client.java | 61 ++++++++++++++--------
.../driver/exception/NoHostAvailableException.java | 4 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 5 +-
.../server/GremlinServerAuthIntegrateTest.java | 3 +-
.../gremlin/server/GremlinServerIntegrateTest.java | 2 +-
.../server/GremlinServerSslIntegrateTest.java | 18 +++++--
8 files changed, 75 insertions(+), 29 deletions(-)
[tinkerpop] 02/02: Changed assertion for SSL error.
Posted by 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
commit e7c889967a5c40de6e4d5086e8e7d547ba6f406b
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Oct 5 09:38:35 2021 -0400
Changed assertion for SSL error.
Seems there is some slightly different behavior around SSLException on master as compared to 3.5-dev CTR
---
.../apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
index fa6b5be..57479a7 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
+import java.nio.channels.ClosedChannelException;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.TimeoutException;
@@ -261,7 +262,7 @@ public class GremlinServerSslIntegrateTest extends AbstractGremlinServerIntegrat
} catch (Exception x) {
assertThat(x, instanceOf(NoHostAvailableException.class));
final Throwable root = ExceptionUtils.getRootCause(x);
- assertThat(root, instanceOf(SSLException.class));
+ assertThat(root, instanceOf(ClosedChannelException.class));
} finally {
cluster.close();
}
[tinkerpop] 01/02: Merge branch '3.5-dev'
Posted by 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
commit a3c38302578ec641b1a2dd089da83d4a099ff28f
Merge: 432f668 abe0b0d
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Oct 5 09:05:55 2021 -0400
Merge branch '3.5-dev'
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 10 ++++
.../apache/tinkerpop/gremlin/driver/Client.java | 61 ++++++++++++++--------
.../driver/exception/NoHostAvailableException.java | 4 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 5 +-
.../server/GremlinServerAuthIntegrateTest.java | 3 +-
.../gremlin/server/GremlinServerIntegrateTest.java | 2 +-
.../server/GremlinServerSslIntegrateTest.java | 17 ++++--
8 files changed, 74 insertions(+), 29 deletions(-)