[jboss-cvs] JBossAS SVN: r83409 - branches/Branch_4_2/messaging/src/main/org/jboss/mq/server.

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

Author: adrian at jboss.org
Date: 2009-01-26 09:04:02 -0500 (Mon, 26 Jan 2009)
New Revision: 83409

Modified:
   branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/BasicQueue.java
Log:
[JBAS-6412] - Handle the failure to persist the redelivery flags by logging a warning

Modified: branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/BasicQueue.java
===================================================================
--- branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/BasicQueue.java	2009-01-26 12:27:27 UTC (rev 83408)
+++ branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/BasicQueue.java	2009-01-26 14:04:02 UTC (rev 83409)
@@ -1206,12 +1206,22 @@
       {
          // Temporarily set the flags
          messageRef.redelivered();
-         // Update the persistent message outside the transaction
-         // We want to know the message might have been delivered regardless
-         messageRef.invalidate();
-         server.getPersistenceManager().update(messageRef, null);
-         // Now revert the flags back again (but only in memory)
-         messageRef.revertRedelivered();
+         try
+         {
+            // Update the persistent message outside the transaction
+            // We want to know the message might have been delivered regardless
+            messageRef.invalidate();
+            server.getPersistenceManager().update(messageRef, null);
+         }
+         catch (Throwable t)
+         {
+            log.warn("Unable to persist redelivery flags for " + messageRef, t);
+         }
+         finally
+         {
+            // Now revert the flags back again (but only in memory)
+            messageRef.revertRedelivered();
+         }
       }
    }