[hornetq-commits] JBoss hornetq SVN: r8991 - in trunk: tests/src/org/hornetq/tests/integration/jms/client and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-03-29 00:53:24 -0400 (Mon, 29 Mar 2010)
New Revision: 8991

Modified:
   trunk/src/main/org/hornetq/jms/persistence/impl/journal/JournalJMSStorageManagerImpl.java
   trunk/tests/src/org/hornetq/tests/integration/jms/client/CreateCFTest.java
Log:
tweak on jms storage jndi

Modified: trunk/src/main/org/hornetq/jms/persistence/impl/journal/JournalJMSStorageManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/persistence/impl/journal/JournalJMSStorageManagerImpl.java	2010-03-29 04:37:20 UTC (rev 8990)
+++ trunk/src/main/org/hornetq/jms/persistence/impl/journal/JournalJMSStorageManagerImpl.java	2010-03-29 04:53:24 UTC (rev 8991)
@@ -200,6 +200,8 @@
          currentJNDI = new PersistedJNDI(type, name);
       }
       
+      mapJNDI.put(key, currentJNDI);
+      
       currentJNDI.addJNDI(address);
 
       long newId = idGenerator.generateID();

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/CreateCFTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/CreateCFTest.java	2010-03-29 04:37:20 UTC (rev 8990)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/CreateCFTest.java	2010-03-29 04:53:24 UTC (rev 8991)
@@ -61,22 +61,20 @@
 
       factCFG.setConnectorNames(listStr);
 
-      jmsServer.createConnectionFactory(factCFG, "/someCF");
+      jmsServer.createConnectionFactory(factCFG, "/someCF", "/someCF2" );
 
-      openCon();
+      openCon("/someCF");
+      openCon("/someCF2");
 
       jmsServer.stop();
 
       jmsServer.start();
 
-      openCon();
+      openCon("/someCF");
+      openCon("/someCF2");
 
-      jmsServer.createConnectionFactory(factCFG, "/someCF");
 
 
-      openCon();
-
-
       jmsServer.stop();
 
    }
@@ -85,9 +83,9 @@
     * @throws NamingException
     * @throws JMSException
     */
-   private void openCon() throws NamingException, JMSException
+   private void openCon(String name) throws NamingException, JMSException
    {
-      ConnectionFactory cf = (ConnectionFactory)context.lookup("/someCF");
+      ConnectionFactory cf = (ConnectionFactory)context.lookup(name);
 
       Connection conn = cf.createConnection();