[jboss-cvs] JBoss Messaging SVN: r5598 - 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-08 06:55:38 -0500 (Thu, 08 Jan 2009)
New Revision: 5598

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-08 04:24:06 UTC (rev 5597)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2009-01-08 11:55:38 UTC (rev 5598)
@@ -61,8 +61,10 @@
    
    // Static ---------------------------------------------------------------------------------------
    
-   private static boolean trace;      
+   private static boolean trace;
    
+   private static boolean debug;
+   
    private static final int WAIT_TIMEOUT = 30000;
    
    
@@ -70,6 +72,7 @@
    {
       log = Logger.getLogger(ClientConsumer.class);
       trace = log.isTraceEnabled();
+      debug = log.isDebugEnabled();
    }
    
    private static boolean checkExpiredOrReachedMaxdeliveries(MessageProxy proxy,
@@ -86,11 +89,11 @@
       {
          if (expired)
          {
-            log.warn(proxy.getMessage() + " has expired, cancelling to server");
+            if (debug) { log.debug(proxy.getMessage() + " has expired, cancelling to server"); }
          }
          else
          {
-            log.warn(proxy.getMessage() + " has reached maximum delivery number " + maxDeliveries +", cancelling to server");
+            if (debug) { log.debug(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-08 04:24:06 UTC (rev 5597)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2009-01-08 11:55:38 UTC (rev 5598)
@@ -139,6 +139,8 @@
    // Attributes -----------------------------------------------------------------------------------
 
    private boolean trace = log.isTraceEnabled();
+   
+   private boolean debug = log.isDebugEnabled();
 
    private String id;
 
@@ -1629,7 +1631,7 @@
          {
             //Sent to expiry queue
 
-            log.warn("Sending expired message: " + rec.del.getReference() + " to expiry queue " + rec.expiryQueue);
+            if (debug) { log.debug("Sending expired message: " + rec.del.getReference() + " to expiry queue " + rec.expiryQueue); }
             JBossMessage copy = makeCopyForDLQOrExpiry(true, del);
 
             moveInTransaction(copy, del, rec.expiryQueue, false);
@@ -1637,7 +1639,7 @@
          else
          {
             //Send to DLQ
-            log.warn("Sending message: " + rec.del.getReference() + " to dlq " + rec.dlq);
+            if (debug) { log.debug("Sending message: " + rec.del.getReference() + " to dlq " + rec.dlq); }
 
             JBossMessage copy = makeCopyForDLQOrExpiry(false, del);