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

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

Author: timfox
Date: 2007-10-19 10:22:45 -0400 (Fri, 19 Oct 2007)
New Revision: 3208

Modified:
   trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Fix to sync reaping


Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2007-10-19 13:42:22 UTC (rev 3207)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2007-10-19 14:22:45 UTC (rev 3208)
@@ -133,6 +133,8 @@
       
       this.reaperPeriod = reaperPeriod;
       
+      this.synchronousReapMessages = synchronousReapMessages;
+      
       if (reaperPeriod > 0)
       {
 	      reaperTimer = new Timer(true);

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-19 13:42:22 UTC (rev 3207)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-19 14:22:45 UTC (rev 3208)
@@ -2851,11 +2851,13 @@
    	}
    	
    	//Now we replace the semaphore since some of the acks may not come back from the old failover node
-   	if (this.replicateSemaphore != null)
+   	if (replicateSemaphore != null)
    	{
-   		replicateSemaphore.release(maxConcurrentReplications);
+   		Semaphore oldSem = replicateSemaphore;
+
+   		replicateSemaphore = new Semaphore(maxConcurrentReplications);
    		
-   		replicateSemaphore = new Semaphore(maxConcurrentReplications);
+   		oldSem.release(maxConcurrentReplications);   		
    	}
    }