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

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

Author: timfox
Date: 2007-10-25 08:49:33 -0400 (Thu, 25 Oct 2007)
New Revision: 3241

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1119


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-10-25 12:39:16 UTC (rev 3240)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-10-25 12:49:33 UTC (rev 3241)
@@ -651,14 +651,25 @@
    {
       if (trace) { log.trace(this + " sending message " + msg + (tx == null ? " non-transactionally" : " in " + tx)); }
 
-      if (checkForDuplicates && msg.isReliable())
-      {
-         // Message is already stored... so just ignoring the call
-         if (serverPeer.getPersistenceManagerInstance().referenceExists(msg.getMessageID()))
+      if (checkForDuplicates)
+      {      	
+      	if (msg.isReliable())
          {
-         	if (trace) { log.trace("Duplicate of " + msg + " exists in database - probably sent before failover"); }
-            return;
-         }
+      		if (serverPeer.getPersistenceManagerInstance().referenceExists(msg.getMessageID()))
+      		{
+	      		// Message is already stored... so just ignoring the call
+	         	if (trace) { log.trace("Duplicate of " + msg + " exists in database - probably sent before failover"); }
+	         	
+	            return;
+      		}
+         }	      
+      	else
+      	{
+      		//NP messages get rejected http://jira.jboss.com/jira/browse/JBMESSAGING-1119
+      		if (trace) { log.trace("Rejecting NP message " + msg + " after failover"); }
+      		
+      		return;
+      	}
       }
       
       JBossDestination dest = (JBossDestination)msg.getJMSDestination();