svn commit: r1396158 - in /openejb/trunk/openejb/container/openejb-core/src: main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java test/java/org/apache/openejb/core/mdb/JmsTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Oct  9 18:24:59 2012
New Revision: 1396158

URL: http://svn.apache.org/viewvc?rev=1396158&view=rev
Log:
cleaning brokers to try to be able to use using createTemporaryQueue

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
    openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=1396158&r1=1396157&r2=1396158&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java Tue Oct  9 18:24:59 2012
@@ -209,4 +209,15 @@ public class ActiveMQ5Factory implements
     public Collection<BrokerService> getBrokers() {
         return brokers.values();
     }
+
+    public static synchronized void clear() {
+        for (BrokerService bs : brokers.values()) {
+            try {
+                bs.stop();
+            } catch (Exception e) {
+                // no-op
+            }
+        }
+        brokers.clear();
+    }
 }

Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1396158&r1=1396157&r2=1396158&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java Tue Oct  9 18:24:59 2012
@@ -25,6 +25,7 @@ import org.apache.geronimo.connector.wor
 import org.apache.geronimo.connector.work.WorkContextHandler;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.resource.activemq.ActiveMQ5Factory;
 import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
 import org.apache.openejb.util.Duration;
 import org.apache.openejb.util.NetworkUtil;
@@ -36,6 +37,7 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -51,6 +53,8 @@ public class JmsTest extends TestCase {
     protected void setUp() throws Exception {
         super.setUp();
 
+        ActiveMQ5Factory.clear();
+
         // create a transaction manager
         final GeronimoTransactionManager transactionManager = new GeronimoTransactionManager();
 
@@ -118,12 +122,13 @@ public class JmsTest extends TestCase {
 
             // create a new temp response queue
             session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            final Destination responseQueue = session.createQueue("queue-tmp");
+            final Destination responseQueue = session.createTemporaryQueue();
 
             // Create a request messages
             final ObjectMessage requestMessage = session.createObjectMessage();
             requestMessage.setJMSReplyTo(responseQueue);
             requestMessage.setObject((Serializable) request);
+            requestMessage.setJMSCorrelationID(UUID.randomUUID().toString());
 
             // Send the request message
             producer = session.createProducer(requestQueue);