[jboss-cvs] JBoss Messaging SVN: r1847 - in trunk: . src/main/org/jboss/jms/server/endpoint src/main/org/jboss/messaging/core

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

Author: timfox
Date: 2006-12-22 05:23:27 -0500 (Fri, 22 Dec 2006)
New Revision: 1847

Modified:
   trunk/build-thirdparty.xml
   trunk/src/main/org/jboss/jms/server/endpoint/DefaultCancel.java
   trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
Log:
Minor tweaks + upgrade JGroups dependency to 2.4.1



Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2006-12-22 09:41:56 UTC (rev 1846)
+++ trunk/build-thirdparty.xml	2006-12-22 10:23:27 UTC (rev 1847)
@@ -85,7 +85,7 @@
       <componentref name="oswego-concurrent" version="1.3.4"/>
       <componentref name="apache-log4j" version="1.2.8"/>
       <componentref name="javassist" version="3.2.0.GA"/>
-      <componentref name="jgroups" version="2.4"/>
+      <componentref name="jgroups" version="2.4.1"/>
       <componentref name="trove" version="1.0.2"/>
       <componentref name="jboss/common-core" version="2.0.2.GA"/>
       <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>

Modified: trunk/src/main/org/jboss/jms/server/endpoint/DefaultCancel.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/DefaultCancel.java	2006-12-22 09:41:56 UTC (rev 1846)
+++ trunk/src/main/org/jboss/jms/server/endpoint/DefaultCancel.java	2006-12-22 10:23:27 UTC (rev 1847)
@@ -27,6 +27,10 @@
  * A Cancel.
  * 
  * Used to send a cancel (NACK) to the server
+ * 
+ * When we cancel we send delivery count info, this means delivery count
+ * can be updated on the server, and into storage if persistent, and the
+ * message can be sent to DLQ if appropriate
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 1.1 $</tt>

Modified: trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-12-22 09:41:56 UTC (rev 1846)
+++ trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-12-22 10:23:27 UTC (rev 1847)
@@ -592,7 +592,7 @@
 
          while (true)
          {           
-            synchronized (deliveryLock)
+            synchronized (refLock)
             {
                ref = nextReference(iter);               
             }