Author: jbonofre
Date: Fri May 22 13:17:33 2009
New Revision: 777510
URL: http://svn.apache.org/viewvc?rev=777510&view=rev
Log:
SM-1854: SA is not stopped before shutting down.
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java?rev=777510&r1=777509&r2=777510&view=diff
==============================================================================
---
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
(original)
+++
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
Fri May 22 13:17:33 2009
@@ -227,6 +227,9 @@
public synchronized String shutDown(boolean writeState) throws Exception {
LOG.info("Shutting down service assembly: " + getName());
+ if (currentState != STOPPED) {
+ this.stop(writeState, false);
+ }
List<Element> componentFailures = new ArrayList<Element>();
for (int i = 0; i < sus.length; i++) {
if (sus[i].isStarted()) {