[jboss-cvs] JBoss Messaging SVN: r2158 - in trunk/src/main/org/jboss: messaging/core and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2007-02-02 20:32:40 -0500 (Fri, 02 Feb 2007)
New Revision: 2158

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-808 - fix

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-02-03 00:39:41 UTC (rev 2157)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-02-03 01:32:40 UTC (rev 2158)
@@ -1114,7 +1114,9 @@
       
       if (rec == null)
       {
-         throw new IllegalStateException("Cannot find " + ack + " to acknowledge");
+         log.warn("Cannot find " + ack + " to acknowledge, " +
+            "maybe it was already acknowledged before failover!");
+         return;
       }
       
       rec.del.acknowledge(null);    

Modified: trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2007-02-03 00:39:41 UTC (rev 2157)
+++ trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2007-02-03 01:32:40 UTC (rev 2158)
@@ -496,8 +496,12 @@
                if (!liter.hasNext())
                {
                   // TODO we need to look in paging state too - currently not supported
+
+                  //http://jira.jboss.org/jira/browse/JBMESSAGING-808
+                  log.warn("Cannot find ref in queue! (Might be paged!) " + id);
+                  break;
                   
-                  throw new IllegalStateException("Cannot find ref in queue! (Might be paged!) " + id);
+                  //throw new IllegalStateException("Cannot find ref in queue! (Might be paged!) " + id);
                }
                
                MessageReference ref = (MessageReference)liter.next();

Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-03 00:39:41 UTC (rev 2157)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-03 01:32:40 UTC (rev 2158)
@@ -1622,7 +1622,10 @@
             
             if (rows != 1)
             {
-               throw new IllegalStateException("Failed to remove row for: " + ref);
+               // http://jira.jboss.com/jira/browse/JBMESSAGING-808
+               log.warn("Failed to remove row for: " + ref);
+               return;
+               //throw new IllegalStateException("Failed to remove row for: " + ref);
             }
             
             if (trace) { log.trace("Deleted " + rows + " rows"); }