commit ee2f0e8aa999010c84f4cf03205106138079f26c
author rinrinne <rinrin.ne@gmail.com> Mon Mar 02 17:46:12 2015 +0900
committer rinrinne <rinrin.ne@gmail.com> Mon Mar 02 17:46:12 2015 +0900
tree a225af3e5aab0af6b10de24d82f75dcee36c4a5f
parent dff7a1a64e91c8809580fe42716b515f3c595d23

Fix shutdown session

src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/impl/AMQPSession.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/impl/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/impl/AMQPSession.java
index 03bf85c..2f72470 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/impl/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/impl/AMQPSession.java
@@ -119,14 +119,19 @@
   public void disconnect() {
     LOGGER.info(MSG("Disconnecting..."));
     try {
+      if (channel != null) {
+        channel.close();
+      }
+    } catch (Exception ex) {
+      LOGGER.warn(MSG("Error when close channel.") , ex);
+    }
+
+    try {
       if (connection != null) {
         connection.close();
       }
     } catch (Exception ex) {
       LOGGER.warn(MSG("Error when close connection.") , ex);
-    } finally {
-      connection = null;
-      channel = null;
     }
   }
 
@@ -160,8 +165,11 @@
         channel = null;
       }
     } else if (obj instanceof Connection) {
-      LOGGER.info(MSG("Connection disconnected."));
-      connection = null;
+      Connection conn = (Connection) obj;
+      if (conn.equals(connection)) {
+        LOGGER.info(MSG("Connection disconnected."));
+        connection = null;
+      }
     }
   }
 }