[jboss-cvs] JBoss Messaging SVN: r5577 - in branches/Branch_1_4/src/main/org/jboss/jms: server/endpoint and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-01-04 02:31:40 -0500 (Sun, 04 Jan 2009)
New Revision: 5577

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
   branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
JBMESSAGING-1451


Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2009-01-03 15:04:37 UTC (rev 5576)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2009-01-04 07:31:40 UTC (rev 5577)
@@ -84,17 +84,14 @@
       
       if (expired || reachedMaxDeliveries)
       {
-         if (trace)
+         if (expired)
          {
-            if (expired)
-            {
-               log.trace(proxy.getMessage() + " has expired, cancelling to server");
-            }
-            else
-            {
-               log.trace(proxy.getMessage() + " has reached maximum delivery number " + maxDeliveries +", cancelling to server");
-            }
+            log.warn(proxy.getMessage() + " has expired, cancelling to server");
          }
+         else
+         {
+            log.warn(proxy.getMessage() + " has reached maximum delivery number " + maxDeliveries +", cancelling to server");
+         }
          
          if (shouldCancel)
          {	         

Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2009-01-03 15:04:37 UTC (rev 5576)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2009-01-04 07:31:40 UTC (rev 5577)
@@ -1629,6 +1629,7 @@
          {
             //Sent to expiry queue
 
+            log.warn("Sending expired message: " + rec.del.getReference() + " to expiry queue " + rec.expiryQueue);
             JBossMessage copy = makeCopyForDLQOrExpiry(true, del);
 
             moveInTransaction(copy, del, rec.expiryQueue, false);
@@ -1636,6 +1637,7 @@
          else
          {
             //Send to DLQ
+            log.warn("Sending message: " + rec.del.getReference() + " to dlq " + rec.dlq);
 
             JBossMessage copy = makeCopyForDLQOrExpiry(false, del);