Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1352 e14183c65 -> f198ce1e7


Set high water mark first in Gremlin Server.

If the low water mark is set first and exceeds the default for high watermark 
then errors ensue.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0b6dc4e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0b6dc4e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0b6dc4e

Branch: refs/heads/TINKERPOP-1352
Commit: e0b6dc4e3660f9e78d099063bd10bbe5b228bf86
Parents: e14183c
Author: Stephen Mallette <[email protected]>
Authored: Fri Jul 1 06:37:30 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Jul 1 06:37:30 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0b6dc4e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
----------------------------------------------------------------------
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 49ce3bc..4d76e30 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -161,8 +161,8 @@ public class GremlinServer {
 
             // when high value is reached then the channel becomes 
non-writable and stays like that until the
             // low value is so that there is time to recover
-            b.childOption(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 
settings.writeBufferLowWaterMark);
             b.childOption(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 
settings.writeBufferHighWaterMark);
+            b.childOption(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 
settings.writeBufferLowWaterMark);
             b.childOption(ChannelOption.ALLOCATOR, 
PooledByteBufAllocator.DEFAULT);
 
             // fire off any lifecycle scripts that were provided by the user. 
hooks get initialized during

Reply via email to