[jboss-cvs] JBoss Messaging SVN: r5133 - in trunk/src/main/org/jboss/messaging/core: server/impl and 1 other directory.

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

Author: timfox
Date: 2008-10-17 11:57:49 -0400 (Fri, 17 Oct 2008)
New Revision: 5133

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
Log:
Fixed JMS tests


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-10-17 14:57:53 UTC (rev 5132)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-10-17 15:57:49 UTC (rev 5133)
@@ -806,7 +806,6 @@
 
          if (response.isError())
          {
-            log.info(response.getMessage() + ":" + response.getResponseCode());
             throw new XAException(response.getResponseCode());
          }
       }

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-10-17 14:57:53 UTC (rev 5132)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-10-17 15:57:49 UTC (rev 5133)
@@ -129,8 +129,6 @@
          persistenceManager.updateDeliveryCount(this);
       }
       
-      log.info("cancelling ref " + this);
-
       QueueSettings queueSettings = queueSettingsRepository.getMatch(queue.getName().toString());
       int maxDeliveries = queueSettings.getMaxDeliveryAttempts();
 
@@ -145,8 +143,6 @@
       {
          long redeliveryDelay = queueSettings.getRedeliveryDelay();
          
-         log.info("redelivery delay " + redeliveryDelay);
-
          if (redeliveryDelay > 0)
          {
             scheduledDeliveryTime = System.currentTimeMillis() + redeliveryDelay;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2008-10-17 14:57:53 UTC (rev 5132)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2008-10-17 15:57:49 UTC (rev 5133)
@@ -244,9 +244,7 @@
       {
          for (MessageReference ref : deliveringRefs)
          {
-            refs.add(ref);
-
-            ref.getQueue().referenceCancelled();
+            refs.add(ref);            
          }
 
          deliveringRefs.clear();

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java	2008-10-17 14:57:53 UTC (rev 5132)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java	2008-10-17 15:57:49 UTC (rev 5133)
@@ -392,8 +392,6 @@
 
    private void doRollback(final Transaction theTx) throws Exception
    {
-      log.info("rolling back");
-      
       boolean wasStarted = started;
 
       List<MessageReference> toCancel = new ArrayList<MessageReference>();