From jboss-cvs-commits at lists.jboss.org  Thu Jul 24 11:15:52 2014
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 24 Jul 2014 11:15:52 -0400
Subject: [jboss-cvs] JBoss Messaging SVN: r8631 -
	branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice.
Message-ID: <201407241515.s6OFFqi2021956@svn01.web.mwc.hst.phx2.redhat.com>

Author: gaohoward
Date: 2014-07-24 11:15:51 -0400 (Thu, 24 Jul 2014)
New Revision: 8631

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
JBMESSAGING-1954 
MessagePostOffice.routeInternal() method may fail to release the readlock



Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2014-04-28 12:42:14 UTC (rev 8630)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2014-07-24 15:15:51 UTC (rev 8631)
@@ -3040,14 +3040,14 @@
          }
       }
       
-      //check inactive condition
-      if (inactiveConditions.contains(condition))
-      {
-         throw new IllegalStateException("Destination " + condition + " not active!");
-      }
-      
       try
       {
+         //check inactive condition
+         if (inactiveConditions.contains(condition))
+         {
+            throw new IllegalStateException("Destination " + condition + " not active!");
+         }
+
          List queues = (List)mappings.get(condition);
          
          if (queues != null)


From jboss-cvs-commits at lists.jboss.org  Thu Jul 24 14:06:06 2014
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 24 Jul 2014 14:06:06 -0400
Subject: [jboss-cvs] JBoss Messaging SVN:  r8632 - branches.
Message-ID: <201407241806.s6OI66HY015901@svn01.web.mwc.hst.phx2.redhat.com>

Author: dgrove_redhat.com
Date: 2014-07-24 14:06:06 -0400 (Thu, 24 Jul 2014)
New Revision: 8632

Added:
   branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/
Log:
JBPAPP-11168


From jboss-cvs-commits at lists.jboss.org  Thu Jul 24 14:33:54 2014
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 24 Jul 2014 14:33:54 -0400
Subject: [jboss-cvs] JBoss Messaging SVN: r8633 - in
	branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954:
	src/main/org/jboss/messaging/core/impl/postoffice and 1 other
	directory.
Message-ID: <201407241833.s6OIXsk4017371@svn01.web.mwc.hst.phx2.redhat.com>

Author: dgrove_redhat.com
Date: 2014-07-24 14:33:54 -0400 (Thu, 24 Jul 2014)
New Revision: 8633

Modified:
   branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/
   branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
JBPAPP-11168


Property changes on: branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JBM1842:8169-8232
   + /branches/Branch_1_4:8631
/branches/JBM1842:8169-8232

Modified: branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2014-07-24 18:06:06 UTC (rev 8632)
+++ branches/Branch_JBossMessaging_1_4_8_SP9_JBMESSAGING-1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2014-07-24 18:33:54 UTC (rev 8633)
@@ -3040,14 +3040,14 @@
          }
       }
       
-      //check inactive condition
-      if (inactiveConditions.contains(condition))
-      {
-         throw new IllegalStateException("Destination " + condition + " not active!");
-      }
-      
       try
       {
+         //check inactive condition
+         if (inactiveConditions.contains(condition))
+         {
+            throw new IllegalStateException("Destination " + condition + " not active!");
+         }
+
          List queues = (List)mappings.get(condition);
          
          if (queues != null)