[jboss-cvs] JBoss Messaging SVN: r3619 - trunk/src/main/org/jboss/jms/server/endpoint.

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

Author: timfox
Date: 2008-01-23 06:41:34 -0500 (Wed, 23 Jan 2008)
New Revision: 3619

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
Fixed failing tests


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2008-01-23 10:56:39 UTC (rev 3618)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2008-01-23 11:41:34 UTC (rev 3619)
@@ -117,6 +117,13 @@
    
    private boolean firstTime = true;
    
+   
+   //FIXME temp
+   public Queue getMessageQueue()
+   {
+      return messageQueue;
+   }
+   
    // Constructors ---------------------------------------------------------------------------------
 
    ServerConsumerEndpoint(MessagingServer sp, String id, Queue messageQueue, String queueName,

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2008-01-23 10:56:39 UTC (rev 3618)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2008-01-23 11:41:34 UTC (rev 3619)
@@ -927,7 +927,7 @@
 
          refs.add(rec.ref);
 
-         if (rec.ref.getMessage().isDurable())
+         if (rec.ref.getMessage().isDurable() && rec.getConsumer().getMessageQueue().isDurable())
          {
             tx.setContainsPersistent(true);
          }
@@ -1473,10 +1473,6 @@
 
       String queueName;
 
-      boolean replicating;
-
-      volatile boolean waitingForResponse;
-
       long deliveryID;
 
       ServerConsumerEndpoint getConsumer()
@@ -1492,7 +1488,7 @@
       }
 
       private DeliveryRecord(MessageReference ref, Queue dlq, Queue expiryQueue, long redeliveryDelay, int maxDeliveryAttempts,
-      		         String queueName, long deliveryID)
+      		                 String queueName, long deliveryID)
       {
       	this.ref = ref;