svn commit: r1399600 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java

[rmannibucau]

Author: rmannibucau
Date: Thu Oct 18 12:09:34 2012
New Revision: 1399600

URL: http://svn.apache.org/viewvc?rev=1399600&view=rev
Log:
quick try to fix AMQ issues

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1399600&r1=1399599&r2=1399600&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
 Thu Oct 18 12:09:34 2012
@@ -165,6 +165,11 @@ public class ActiveMQResourceAdapter ext
                         compositeData.getParameters().put("persistent", 
"false");
                     }
 
+                    // compromise to avoid broker lock in some case + avoid 
failing tests
+                    if 
(!compositeData.getParameters().containsKey("watchTopicAdvisories")) {
+                        
compositeData.getParameters().put("watchTopicAdvisories", "false");
+                    }
+
                     if 
("false".equalsIgnoreCase(compositeData.getParameters().get("persistent").toString()))
 {
                         properties.remove("DataSource"); // no need
                     }