This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 035e7bb GEM-2031: Removing the use of shutdownNow from AcceptorImpl
pools
035e7bb is described below
commit 035e7bb5261da510fea3321379383a86d6a1439b
Author: Dan Smith <[email protected]>
AuthorDate: Thu Jun 28 11:55:06 2018 -0700
GEM-2031: Removing the use of shutdownNow from AcceptorImpl pools
Using shutdownNow interrupts the threads in these pools. These threads
may be doing IO on sockets, so shutdownNow will interrupt the threads
and potentially cause issues shutting down.
---
.../org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
index 875ff6d..47712ed 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
@@ -592,7 +592,7 @@ public class AcceptorImpl implements Acceptor, Runnable,
CommBufferPool {
} catch (IllegalArgumentException poolInitException) {
this.stats.close();
this.serverSock.close();
- this.pool.shutdownNow();
+ this.pool.shutdown();
throw poolInitException;
}
}
@@ -1686,8 +1686,8 @@ public class AcceptorImpl implements Acceptor, Runnable,
CommBufferPool {
Thread.currentThread().interrupt();
this.pool.shutdownNow();
}
- this.clientQueueInitPool.shutdownNow();
- this.hsPool.shutdownNow();
+ this.clientQueueInitPool.shutdown();
+ this.hsPool.shutdown();
}
private void shutdownSCs() {
