You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/03/31 22:37:18 UTC

incubator-geode git commit: GEODE-1031 Now pool closes queueMge before connectionMgr

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 7708c3f94 -> 859b4f6c8


GEODE-1031 Now pool closes queueMge before connectionMgr

At cache close, there is possibility that queueMgr is trying to
recover queue but cache/pool trying to close cache with keep-alive
false flag. During this time there is possibility that client(queueMgr)
may be unable to close socket properly as it doesn't know about
keep-alive flag. Thats why closing connectionMge after queueMgr
so that it should be able to send keep-alive flage properly
to server.


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

Branch: refs/heads/develop
Commit: 859b4f6c891ed3f1a93687db1197890b95784dd5
Parents: 7708c3f
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Thu Mar 31 10:19:12 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Thu Mar 31 13:37:10 2016 -0700

----------------------------------------------------------------------
 .../gemfire/cache/client/internal/PoolImpl.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/859b4f6c/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index 84debc8..65a4dd1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -550,19 +550,19 @@ public class PoolImpl implements InternalPool {
       } 
 
       try {
-        if(this.manager != null) {
-          manager.close(keepAlive);
+        if(this.queueManager != null) {
+          queueManager.close(keepAlive);
         }
       } catch(RuntimeException e) {
-        logger.error(LocalizedMessage.create(LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_CONNECTION_MANAGER), e);
+        logger.error(LocalizedMessage.create(LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_SUBSCRIPTION_MANAGER), e);
       }
       
       try {
-        if(this.queueManager != null) {
-          queueManager.close(keepAlive);
+        if(this.manager != null) {
+          manager.close(keepAlive);
         }
       } catch(RuntimeException e) {
-        logger.error(LocalizedMessage.create(LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_SUBSCRIPTION_MANAGER), e);
+        logger.error(LocalizedMessage.create(LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_CONNECTION_MANAGER), e);
       }
       
       try {