svn commit: r1509529 - in /synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp: ha/AMQPTransportReconnectHandler.java pollingtask/AMQPSimpleConsumerTask.java pollingtask/AMQPTransportPollingTask.java

[rajikak]

Author: rajikak
Date: Fri Aug  2 04:10:48 2013
New Revision: 1509529

URL: http://svn.apache.org/r1509529
Log:
fixed logs + multiple consumer ha.

Modified:
    
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/ha/AMQPTransportReconnectHandler.java
    
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPSimpleConsumerTask.java
    
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPTransportPollingTask.java

Modified: 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/ha/AMQPTransportReconnectHandler.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/ha/AMQPTransportReconnectHandler.java?rev=1509529&r1=1509528&r2=1509529&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/ha/AMQPTransportReconnectHandler.java
 (original)
+++ 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/ha/AMQPTransportReconnectHandler.java
 Fri Aug  2 04:10:48 2013
@@ -128,7 +128,7 @@ public class AMQPTransportReconnectHandl
                         new AMQPTransportHABrokerEntry(cf.getChannel(), 
cf.getConnection()));
                 entry.getLock().release();
 
-                while (blockedTasks.isEmpty()) {
+                while (!blockedTasks.isEmpty()) {
                     entry = blockedTasks.take();
                     conFacName = entry.getConnectionFactoryName();
                     cf = connectionFactoryManager.
@@ -136,8 +136,10 @@ public class AMQPTransportReconnectHandl
                     connectionMap.put(
                             entry.getKey(),
                             new AMQPTransportHABrokerEntry(cf.getChannel(), 
cf.getConnection()));
-                    log.info("The task with key '" + entry.getKey() + "' was 
combined with a new " +
-                            "connection factory");
+                    if (log.isDebugEnabled()) {
+                        log.info("The worker task with key '" + entry.getKey() 
+ "' was combined with " +
+                                "a new connection factory");
+                    }
                     entry.getLock().release();
                 }
             }

Modified: 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPSimpleConsumerTask.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPSimpleConsumerTask.java?rev=1509529&r1=1509528&r2=1509529&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPSimpleConsumerTask.java
 (original)
+++ 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPSimpleConsumerTask.java
 Fri Aug  2 04:10:48 2013
@@ -99,7 +99,7 @@ public class AMQPSimpleConsumerTask {
                 semaphore.release();
 
             } catch (IOException e) {
-                log.error("I/O error occurred while retrieving the", e);
+                log.error("I/O error occurred", e);
             } catch (InterruptedException e) {
                 log.error("Retrieving task was interrupted", e);
                 Thread.currentThread().interrupt();

Modified: 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPTransportPollingTask.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPTransportPollingTask.java?rev=1509529&r1=1509528&r2=1509529&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPTransportPollingTask.java
 (original)
+++ 
synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/pollingtask/AMQPTransportPollingTask.java
 Fri Aug  2 04:10:48 2013
@@ -544,7 +544,7 @@ public class AMQPTransportPollingTask {
                         stop();
                         try {
                             start();
-                            log.info("Polling task for service '" + 
serviceName + "' is re-deployed");
+                            log.info("Worker task for service '" + serviceName 
+ "' is re-deployed");
                         } catch (AMQPTransportException ex) {
                             log.error("Start of polling tasks failed. System 
must be restarted!");
                         }