[jboss-cvs] JBoss Messaging SVN: r3967 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP: src/main/org/jboss/jms/server/connectionfactory and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2008-03-27 15:35:23 -0400 (Thu, 27 Mar 2008)
New Revision: 3967

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/.classpath
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java
Log:
completing JBMESSAGING-1262... Calling registerCF and unregisterCF

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/.classpath
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/.classpath	2008-03-27 18:05:52 UTC (rev 3966)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/.classpath	2008-03-27 19:35:23 UTC (rev 3967)
@@ -19,7 +19,7 @@
 	<classpathentry kind="src" path="docs/examples/topic/src"/>
 	<classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
 	<classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src"/>
-	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar" sourcepath="/extra/work-clebert/concurrent/concurrent/src"/>
 	<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2008-03-27 18:05:52 UTC (rev 3966)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2008-03-27 19:35:23 UTC (rev 3967)
@@ -233,6 +233,8 @@
       // Registering with the dispatcher should always be the last thing otherwise a client could
       // use a partially initialised object
       Dispatcher.instance.registerTarget(id, advised);
+      
+      serverPeer.getConnectionManager().registerConnectionFactory(endpoint);
 
       // Replicate the change - we will ignore this locally
 
@@ -279,6 +281,9 @@
       }
 
       Dispatcher.instance.unregisterTarget(endpoint.getID(), endpoint);
+      
+      serverPeer.getConnectionManager().unregisterConnectionFactory(endpoint);
+      
    }
 
    // MessagingComponent implementation ------------------------------------------------------------

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java	2008-03-27 18:05:52 UTC (rev 3966)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java	2008-03-27 19:35:23 UTC (rev 3967)
@@ -23,6 +23,7 @@
 package org.jboss.test.messaging.jms.clustering;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -151,6 +152,9 @@
    {
 
       ConnectionFactory cf = null;
+      
+      // just to make sure the CF will still be around by the time the VM is killed
+      static ArrayList list = new ArrayList();
 
       public ClusterClientCrash(ConnectionFactory cf)
       {
@@ -159,6 +163,7 @@
 
       public Object execute(Server server) throws Exception
       {
+         list.add(cf);
          Connection conn = cf.createConnection();
          conn.start();