Repository: thrift Updated Branches: refs/heads/master e6789480d -> 2bb6f51dd
THRIFT-3031 Java: migrate "shouldStop" flag to TServer Patch: John Wang & Roger Meier Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2bb6f51d Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2bb6f51d Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2bb6f51d Branch: refs/heads/master Commit: 2bb6f51dda6838a7d7c946d4a0ee50f40bcda54b Parents: e678948 Author: Roger Meier <[email protected]> Authored: Mon Mar 23 20:56:27 2015 +0100 Committer: Roger Meier <[email protected]> Committed: Mon Mar 23 20:56:27 2015 +0100 ---------------------------------------------------------------------- .../org/apache/thrift/server/TNonblockingServer.java | 4 ---- lib/java/src/org/apache/thrift/server/TServer.java | 12 ++++++++++++ .../src/org/apache/thrift/server/TSimpleServer.java | 3 --- .../src/org/apache/thrift/server/TThreadPoolServer.java | 4 ---- .../apache/thrift/server/TThreadedSelectorServer.java | 4 ---- 5 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/2bb6f51d/lib/java/src/org/apache/thrift/server/TNonblockingServer.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/server/TNonblockingServer.java b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java index 10a8eba..fe0365a 100644 --- a/lib/java/src/org/apache/thrift/server/TNonblockingServer.java +++ b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java @@ -47,10 +47,6 @@ public class TNonblockingServer extends AbstractNonblockingServer { } } - // Flag for stopping the server - // Please see THRIFT-1795 for the usage of this flag - private volatile boolean stopped_ = false; - private SelectAcceptThread selectAcceptThread_; public TNonblockingServer(AbstractNonblockingServerArgs args) { http://git-wip-us.apache.org/repos/asf/thrift/blob/2bb6f51d/lib/java/src/org/apache/thrift/server/TServer.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/server/TServer.java b/lib/java/src/org/apache/thrift/server/TServer.java index a85a429..80f4f86 100644 --- a/lib/java/src/org/apache/thrift/server/TServer.java +++ b/lib/java/src/org/apache/thrift/server/TServer.java @@ -127,6 +127,10 @@ public abstract class TServer { protected TServerEventHandler eventHandler_; + // Flag for stopping the server + // Please see THRIFT-1795 for the usage of this flag + protected volatile boolean stopped_ = false; + protected TServer(AbstractServerArgs args) { processorFactory_ = args.processorFactory; serverTransport_ = args.serverTransport; @@ -162,4 +166,12 @@ public abstract class TServer { public TServerEventHandler getEventHandler() { return eventHandler_; } + + public boolean getShouldStop() { + return this.stopped_; + } + + public void setShouldStop(boolean shouldStop) { + this.stopped_ = shouldStop; + } } http://git-wip-us.apache.org/repos/asf/thrift/blob/2bb6f51d/lib/java/src/org/apache/thrift/server/TSimpleServer.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/server/TSimpleServer.java b/lib/java/src/org/apache/thrift/server/TSimpleServer.java index 4dfc176..e815b2c 100644 --- a/lib/java/src/org/apache/thrift/server/TSimpleServer.java +++ b/lib/java/src/org/apache/thrift/server/TSimpleServer.java @@ -35,9 +35,6 @@ public class TSimpleServer extends TServer { private static final Logger LOGGER = LoggerFactory.getLogger(TSimpleServer.class.getName()); - // Please see THRIFT-1795 for the usage of this flag - private volatile boolean stopped_ = false; - public TSimpleServer(AbstractServerArgs args) { super(args); } http://git-wip-us.apache.org/repos/asf/thrift/blob/2bb6f51d/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java index adac27e..8009118 100755 --- a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java +++ b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java @@ -100,10 +100,6 @@ public class TThreadPoolServer extends TServer { // Executor service for handling client connections private ExecutorService executorService_; - // Flag for stopping the server - // Please see THRIFT-1795 for the usage of this flag - private volatile boolean stopped_ = false; - private final TimeUnit stopTimeoutUnit; private final long stopTimeoutVal; http://git-wip-us.apache.org/repos/asf/thrift/blob/2bb6f51d/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java b/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java index 9eb9f90..8737413 100644 --- a/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java +++ b/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java @@ -180,10 +180,6 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer { } } - // Flag for stopping the server - // Please see THRIFT-1795 for the usage of this flag - private volatile boolean stopped_ = false; - // The thread handling all accepts private AcceptThread acceptThread;
