You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2010/11/05 11:30:03 UTC
svn commit: r1031504 - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
Author: andygumbrecht
Date: Fri Nov 5 10:30:03 2010
New Revision: 1031504
URL: http://svn.apache.org/viewvc?rev=1031504&view=rev
Log:
ActiveMQResourceAdapter.java - Only override 'persistent' if it is not specified in the broker URI.
AdminDaemon.java - If stop is called repeatedly then it is possible that the Server instance has been removed.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1031504&r1=1031503&r2=1031504&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java Fri Nov 5 10:30:03 2010
@@ -136,7 +136,12 @@ public class ActiveMQResourceAdapter ext
if (brokerXmlConfig.startsWith("broker:")) {
final URISupport.CompositeData compositeData = URISupport.parseComposite(new URI(brokerXmlConfig));
- compositeData.getParameters().put("persistent", "false");
+
+ if (!compositeData.getParameters().containsKey("persistent")) {
+ //Override default - Which is 'true'
+ compositeData.getParameters().put("persistent", "false");
+ }
+
setBrokerXmlConfig(ActiveMQFactory.getBrokerMetaFile() + compositeData.toURI());
} else if (brokerXmlConfig.toLowerCase().startsWith("xbean:")) {
setBrokerXmlConfig(ActiveMQFactory.getBrokerMetaFile() + brokerXmlConfig);
@@ -200,7 +205,7 @@ public class ActiveMQResourceAdapter ext
final Iterator<BrokerService> it = brokers.iterator();
- while(it.hasNext()){
+ while (it.hasNext()) {
try {
it.next().waitUntilStopped();
} catch (Throwable t) {
Modified: openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java?rev=1031504&r1=1031503&r2=1031504&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java (original)
+++ openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java Fri Nov 5 10:30:03 2010
@@ -51,7 +51,9 @@ public class AdminDaemon implements Serv
case RequestMethodConstants.STOP_REQUEST_Stop:
case RequestMethodConstants.STOP_REQUEST_stop:
Server server = SystemInstance.get().getComponent(Server.class);
- server.stop();
+ if (null != server) {
+ server.stop();
+ }
break;
default:
//If this turns up in the logs then it is time to take action