[jboss-cvs] JBoss Messaging SVN: r8495 - in branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884: src/main/org/jboss/jms/server/endpoint and 1 other directories.

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

Author: raggz
Date: 2012-01-25 06:20:28 -0500 (Wed, 25 Jan 2012)
New Revision: 8495

Modified:
   branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/
   branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
Log:
Back port JBMessaging-1831


Property changes on: branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_1_4:8138,8141
   + /branches/Branch_1_4:8138,8141-8142

Modified: branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2012-01-25 11:01:57 UTC (rev 8494)
+++ branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2012-01-25 11:20:28 UTC (rev 8495)
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jms.IllegalStateException;
 import javax.jms.InvalidDestinationException;

Modified: branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
===================================================================
--- branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java	2012-01-25 11:01:57 UTC (rev 8494)
+++ branches/JBossMessaging_1_4_7_GA_JBMESSAGING-1831_JBMESSAGING-1884/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java	2012-01-25 11:20:28 UTC (rev 8495)
@@ -519,7 +519,7 @@
          RequestSupport req =
             new ConnectionCreateSessionDelegateRequest2("23", (byte)77, true, 23, true, false);
                  
-         testPacket(req, PacketSupport.REQ_CONNECTION_CREATESESSIONDELEGATE);                           
+         testPacket(req, PacketSupport.REQ_CONNECTION_CREATESESSIONDELEGATE2);                           
       }
       
       public void testConnectionGetClientIDRequest() throws Exception