You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/04/17 15:04:41 UTC

geode git commit: GEODE-2770 - Move the shutdown of the rest interface to the same place as other client APIs.

Repository: geode
Updated Branches:
  refs/heads/develop 6f7f94399 -> 3a3077094


GEODE-2770 - Move the shutdown of the rest interface to the same place as other client APIs.

* This will prevent a some client interaction from mutating the state of the system after key components are already shutdown.
* This closes #455


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

Branch: refs/heads/develop
Commit: 3a3077094b92699863284a574601585aca787dcd
Parents: 6f7f943
Author: Charlie Black <ch...@github.com>
Authored: Mon Apr 10 21:58:43 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Apr 17 08:03:24 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/3a307709/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 069b608..59aeac4 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
@@ -2232,6 +2232,8 @@ public class GemFireCacheImpl
 
           stopRedisServer();
 
+          stopRestAgentServer();
+
           // no need to track PR instances since we won't create any more
           // cacheServers or gatewayHubs
           if (this.partitionedRegions != null) {
@@ -2459,7 +2461,6 @@ public class GemFireCacheImpl
         CacheLifecycleListener listener = (CacheLifecycleListener) iter.next();
         listener.cacheClosed(this);
       }
-      stopRestAgentServer();
       // Fix for #49856
       SequenceLoggerImpl.signalCacheClose();
       SystemFailure.signalCacheClose();