geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject incubator-geode git commit: fixed beforeShutDownAll test hook
Date Fri, 04 Nov 2016 20:34:30 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEM-983 3c27307c3 -> 78976c3ec


fixed beforeShutDownAll test hook


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

Branch: refs/heads/feature/GEM-983
Commit: 78976c3ec2b74f985107a0f14baa1d0fef8f1467
Parents: 3c27307
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Fri Nov 4 10:55:39 2016 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Fri Nov 4 10:55:39 2016 -0700

----------------------------------------------------------------------
 .../apache/geode/internal/cache/GemFireCacheImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/78976c3e/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 c76bf2b..e1b2007 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
@@ -1754,6 +1754,13 @@ public class GemFireCacheImpl
   }
 
   public void shutDownAll() {
+    if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+      try {
+        CacheObserverHolder.getInstance().beforeShutdownAll();
+      } finally {
+        LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
+      }
+    }
     if (!this.isShutDownAll.compareAndSet(false, true)) {
       // it's already doing shutdown by another thread
       try {
@@ -1774,13 +1781,6 @@ public class GemFireCacheImpl
               LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
           throw assErr;
         }
-        if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
-          try {
-            CacheObserverHolder.getInstance().beforeShutdownAll();
-          } finally {
-            LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
-          }
-        }
 
         // bug 44031 requires multithread shutdownall should be grouped
         // by root region. However, shutDownAllDuringRecovery.conf test revealed that


Mime
View raw message