You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/10/11 22:05:13 UTC
incubator-geode git commit: shutdownAll now syncs on class before this
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEM-983 [created] 35441b8aa
shutdownAll now syncs on class before this
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/35441b8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/35441b8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/35441b8a
Branch: refs/heads/feature/GEM-983
Commit: 35441b8aa5c96a252afd4a90acf202cbe6737c60
Parents: f223a2e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Oct 11 15:04:43 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Oct 11 15:04:43 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/35441b8a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index d166397..de23cc3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -1655,7 +1655,9 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
}
}
- public synchronized void shutDownAll() {
+ public void shutDownAll() {
+ synchronized(GemFireCacheImpl.class) {
+ synchronized(this) {
boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
if (testIGE) {
@@ -1706,6 +1708,8 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
}
close("Shut down all members", null, false, true);
+ }
+ }
}
private ExecutorService getShutdownAllExecutorService(int size) {