You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/09 20:46:21 UTC
[14/18] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1160' into tp31
Merge remote-tracking branch 'origin/TINKERPOP-1160' into tp31
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/712fca25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/712fca25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/712fca25
Branch: refs/heads/master
Commit: 712fca2515a0d619368393df12ec3d951b50a392
Parents: 9bac3f9 5944ee6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 8 14:39:49 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 8 14:39:49 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 39 +++++-
.../upgrade/release-3.1.x-incubating.asciidoc | 9 ++
.../apache/tinkerpop/gremlin/driver/Client.java | 1 -
.../tinkerpop/gremlin/driver/Cluster.java | 12 ++
.../tinkerpop/gremlin/driver/Connection.java | 14 ++-
.../tinkerpop/gremlin/driver/Settings.java | 120 ++++++++++++++++++-
7 files changed, 189 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/712fca25/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index c530023,6987b2e..dda6e80
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,7 +26,11 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bump to commons-collections 3.2.2.
+* Fixed a compilation bug in `TraversalExplanation`.
+* Fixed bug where a session explicitly closed was being closed again by session expiration.
+* Improved the recovery options for Gremlin Driver after failed requests to Gremlin Server.
+ * Added `maxWaitForSessionClose` to the settings for Gremlin Driver.
* Bumped to Netty 4.0.34.Final.
* Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".
* Bumped to Apache Groovy 2.4.6.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/712fca25/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 10d3b89,a3b8ff3..08ba352
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@@ -238,18 -216,9 +241,18 @@@ final class Connection
}
}
+ /**
+ * Close was signaled in closeAsync() but there were pending messages at that time. This method attempts the
+ * shutdown if the returned result cleared up the last pending message.
+ */
+ private void tryShutdown() {
+ if (isClosed() && pending.isEmpty())
+ shutdown(closeFuture.get());
+ }
+
private void shutdown(final CompletableFuture<Void> future) {
// shutdown can be called directly from closeAsync() or after write() and therefore this method should only
- // be called once. once shutdown is initiated, it shoudln't be executed a second time or else it sends more
+ // be called once. once shutdown is initiated, it shouldn't be executed a second time or else it sends more
// messages at the server and leads to ugly log messages over there.
if (shutdownInitiated.compareAndSet(false, true)) {
if (client instanceof Client.SessionedClient) {