You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/08/18 19:49:37 UTC
incubator-geode git commit: GEODE-77 removed shutdown status check.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 26fea7a16 -> d4a3f1225
GEODE-77 removed shutdown status check.
This check was recently added but it is keeping the manager from
properly shutting down because the status is set by
DirectChannel before the manager is told to shut down.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d4a3f122
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d4a3f122
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d4a3f122
Branch: refs/heads/feature/GEODE-77
Commit: d4a3f122555ee6daa15c6aea38adea30bc1a057d
Parents: 26fea7a
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Aug 18 10:49:11 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Aug 18 10:49:11 2015 -0700
----------------------------------------------------------------------
.../internal/membership/gms/mgr/GMSMembershipManager.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d4a3f122/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index b89b984..76d83f7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -1739,10 +1739,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
public void shutdown() {
- if (!shutdownInProgress) {
- setShutdown();
- services.stop();
- }
+ setShutdown();
+ services.stop();
}
@Override