[jboss-cvs] JBoss Messaging SVN: r5229 - branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl.

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

Author: gaohoward
Date: 2008-10-30 22:21:49 -0400 (Thu, 30 Oct 2008)
New Revision: 5229

Modified:
   branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java
Log:
JBMESSAGING-1416


Modified: branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java
===================================================================
--- branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java	2008-10-30 20:13:20 UTC (rev 5228)
+++ branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java	2008-10-31 02:21:49 UTC (rev 5229)
@@ -30,6 +30,7 @@
 
 import org.jboss.jms.message.JBossMessage;
 import org.jboss.logging.Logger;
+import org.jboss.messaging.core.contract.Message;
 import org.jboss.messaging.core.contract.MessageReference;
 import org.jboss.messaging.core.impl.tx.Transaction;
 
@@ -233,10 +234,14 @@
       String name = null;
       try
       {
-         JBossMessage msg = (JBossMessage)ref.getMessage();
-         if (msg != null)
+         Message obj = ref.getMessage();
+         if (obj instanceof JBossMessage)
          {
-            name = msg.getStringProperty(JBossMessage.JBOSS_MESSAGING_ORDERING_GROUP_ID);
+            JBossMessage msg = (JBossMessage)ref.getMessage();
+            if (msg != null)
+            {
+               name = msg.getStringProperty(JBossMessage.JBOSS_MESSAGING_ORDERING_GROUP_ID);
+            }
          }
       }
       catch (JMSException e)