Andy, can you fill a JIRA please? That's an important information to share on release notes I think.
Jean-Louis 2012/11/15 <[email protected]> > Author: andygumbrecht > Date: Thu Nov 15 09:06:27 2012 > New Revision: 1409700 > > URL: http://svn.apache.org/viewvc?rev=1409700&view=rev > Log: > Now we hold the broker instance it is up to us to 'stop' it ;-) > > 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=1409700&r1=1409699&r2=1409700&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 Nov 15 09:06:27 2012 > @@ -121,9 +121,9 @@ public class ActiveMQResourceAdapter ext > ActiveMQFactory.setThreadProperties(properties); > > try { > - > + //The returned broker should be started, but calling start is > harmless. > + //We do not need to track the instance as the factory takes > care of this. > > ActiveMQFactory.createBroker(URI.create(getBrokerXmlConfig())).start(); > - //super.start(bootstrapContext); > } catch (Exception e) { > > org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, > ActiveMQResourceAdapter.class).getChildLogger("service").fatal("Failed to > start ActiveMQ", e); > } finally { > @@ -191,8 +191,12 @@ public class ActiveMQResourceAdapter ext > final Iterator<BrokerService> it = brokers.iterator(); > > while (it.hasNext()) { > + > + final BrokerService bs = it.next(); > + > try { > - it.next().waitUntilStopped(); > + bs.stop(); > + bs.waitUntilStopped(); > } catch (Throwable t) { > //Ignore > } > > > -- Jean-Louis
