From b23ae0defb243e3ab2afaecb70b7007727f8527b Mon Sep 17 00:00:00 2001
From: Simon Pamies <spamsch@gmail.com>
Date: Wed, 19 Jun 2013 18:52:10 +0200
Subject: [PATCH] Fixed consumer channel selection and added better exception
 logging

---
 .../impl/ReplicationMasterDescriptorImpl.java          |  2 +-
 .../replication/impl/ReplicationServiceImpl.java       | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationMasterDescriptorImpl.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationMasterDescriptorImpl.java
index 71a33dd32e3..3ea274e2594 100755
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationMasterDescriptorImpl.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationMasterDescriptorImpl.java
@@ -48,7 +48,7 @@ public class ReplicationMasterDescriptorImpl implements ReplicationMasterDescrip
             connectionFactory.setPort(port);
         }
         Connection connection = connectionFactory.newConnection();
-        Channel channel = connection.createChannel(0);
+        Channel channel = connection.createChannel();
         channel.exchangeDeclare(exchangeName, "fanout");
         QueueingConsumer consumer = new QueueingConsumer(channel);
         String queueName = channel.queueDeclare().getQueue();
diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java
index 65e9f9929c3..5ab2806047b 100644
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java
@@ -181,7 +181,15 @@ public class ReplicationServiceImpl implements ReplicationService, OperationExec
         logger.info("Starting to replicate from "+master);
         replicatingFromMaster = master;
         registerReplicaWithMaster(master);
-        QueueingConsumer consumer = master.getConsumer();
+        logger.info("Registered replica with master");
+        QueueingConsumer consumer = null;
+        try {
+            consumer = master.getConsumer();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw ex;
+        }
+        logger.info("Connection to exchange successful.");
         URL initialLoadURL = master.getInitialLoadURL();
         logger.info("Initial load URL is "+initialLoadURL);
         final Replicator replicator = new Replicator(master, this, /* startSuspended */ true, consumer);