commit 4b27c98a64b3c2bcd26ddeca33485c78ec6b648f
author rinrinne <rinrin.ne@gmail.com> Wed Jan 08 10:58:22 2014 +0900
committer rinrinne <rinrin.ne@gmail.com> Wed Jan 08 10:58:22 2014 +0900
tree f5c0426e5a5694784259973abd904bd22862393e
parent b114b7c55954229888fd2475405682f816906a98

Update error handling during bind

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
index 24e68b3..6664c6f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
@@ -90,15 +90,16 @@
           ch.queueBind(properties.getAMQPQueue(), exchangeName, routingKey);
           publishChannel = ch;
           LOGGER.info("Channel for queue \"" + properties.getAMQPQueue() + "\" opened.");
-        } else {
+        } else if (StringUtils.isNotEmpty(exchangeName)) {
           LOGGER.info("Exchange mode");
           exchangeName = properties.getAMQPExchange();
-          if (StringUtils.isNotEmpty(exchangeName)) {
-            LOGGER.debug("Declare exchange: " + exchangeName);
-            ch.exchangeDeclarePassive(exchangeName);
-            publishChannel = ch;
-            LOGGER.info("Channel for exchange \"" + exchangeName + "\" opened.");
-          }
+          LOGGER.debug("Declare exchange: " + exchangeName);
+          ch.exchangeDeclarePassive(exchangeName);
+          publishChannel = ch;
+          LOGGER.info("Channel for exchange \"" + exchangeName + "\" opened.");
+        } else {
+          LOGGER.warn("Unrecognized bind mode.");
+          throw new IOException();
         }
       } catch (Exception ex) {
         LOGGER.warn("#bind: " + ex.getClass().getName());