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/04/26 16:58:14 UTC
[tinkerpop] branch master updated (6721649 -> 4174ee6)
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 6721649 Merge branch '3.4-dev'
add 0827e70 Seems like reconnect produced similar problems as those found on TINKERPOP-2550 CTR
new 4174ee6 Merge branch '3.4-dev'
The 1 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 | 2 +-
.../org/apache/tinkerpop/gremlin/driver/Client.java | 13 +------------
.../org/apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++++++++++++++-
.../java/org/apache/tinkerpop/gremlin/driver/Host.java | 2 +-
.../org/apache/tinkerpop/gremlin/driver/ClientTest.java | 4 ++++
.../gremlin/server/GremlinServerIntegrateTest.java | 9 ++++++++-
.../tinkerpop/gremlin/server/TestClientFactory.java | 2 +-
7 files changed, 32 insertions(+), 17 deletions(-)
[tinkerpop] 01/01: Merge branch '3.4-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 4174ee68c01e38d35666628dbc1774e197cf985c
Merge: 6721649 0827e70
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Apr 26 12:56:50 2021 -0400
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 2 +-
.../org/apache/tinkerpop/gremlin/driver/Client.java | 13 +------------
.../org/apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++++++++++++++-
.../java/org/apache/tinkerpop/gremlin/driver/Host.java | 2 +-
.../org/apache/tinkerpop/gremlin/driver/ClientTest.java | 4 ++++
.../gremlin/server/GremlinServerIntegrateTest.java | 9 ++++++++-
.../tinkerpop/gremlin/server/TestClientFactory.java | 2 +-
7 files changed, 32 insertions(+), 17 deletions(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 6eeab95,8a63694..42fd78a
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@@ -58,8 -60,9 +58,10 @@@ import org.hamcrest.Matchers
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+
+ import org.slf4j.LoggerFactory;
+
-import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@@ -97,8 -99,8 +99,9 @@@ import static org.junit.Assume.assumeTh
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegrationTest {
+
private Level previousLogLevel;
+ private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GremlinServerIntegrateTest.class);
private Log4jRecordingAppender recordingAppender = null;
private final Supplier<Graph> graphGetter = () -> server.getServerGremlinExecutor().getGraphManager().getGraph("graph");