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

[rmannibucau]

Author: rmannibucau
Date: Tue Oct 16 17:59:48 2012
New Revision: 1398903

URL: http://svn.apache.org/viewvc?rev=1398903&view=rev
Log:
TOMEE-474 ignoring datasource parameter for broker with persistent=false param

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=1398903&r1=1398902&r2=1398903&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
 Tue Oct 16 17:59:48 2012
@@ -165,6 +165,10 @@ public class ActiveMQResourceAdapter ext
                         compositeData.getParameters().put("persistent", 
"false");
                     }
 
+                    if 
("false".equalsIgnoreCase(compositeData.getParameters().get("persistent").toString()))
 {
+                        properties.remove("DataSource"); // no need
+                    }
+
                     setBrokerXmlConfig(ActiveMQFactory.getBrokerMetaFile() + 
compositeData.toURI());
                 } else if (brokerXmlConfig.toLowerCase().startsWith("xbean:")) 
{
                     setBrokerXmlConfig(ActiveMQFactory.getBrokerMetaFile() + 
brokerXmlConfig);