geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [1/7] geode git commit: [GEODE-2324] Update isShutdownProperly method.
Date Thu, 09 Feb 2017 22:29:07 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 30341ec15 -> cd2291102


[GEODE-2324] Update isShutdownProperly method.


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

Branch: refs/heads/develop
Commit: cd2291102744f4bb1b8bb5170e7388b31295ef6f
Parents: d73ec97
Author: Galen O'Sullivan <gosullivan@pivotal.io>
Authored: Mon Jan 30 11:40:09 2017 -0800
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Thu Feb 9 14:28:48 2017 -0800

----------------------------------------------------------------------
 .../apache/geode/internal/cache/tier/sockets/AcceptorImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/cd229110/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
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 5fa8096..ed29472 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
@@ -1634,9 +1634,10 @@ public class AcceptorImpl extends Acceptor implements Runnable {
   }
 
   public boolean isShutdownProperly() {
-    return !isRunning() && (selectorThread == null || !selectorThread.isAlive())
+    return !isRunning() && !thread.isAlive()
+        && (selectorThread == null || !selectorThread.isAlive())
         && (pool == null || pool.isShutdown()) && (hsPool == null || hsPool.isShutdown())
-        && (selector == null || !selector.isOpen());
+        && (selector == null || !selector.isOpen()) && (tmpSel == null ||
!tmpSel.isOpen());
   }
 
   /**


Mime
View raw message