Author: davsclaus
Date: Tue Apr 24 13:56:52 2012
New Revision: 1329730
URL: http://svn.apache.org/viewvc?rev=1329730&view=rev
Log:
CAMEL-5168: Improved stopping CamelContext from main class
Modified:
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
Modified:
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java?rev=1329730&r1=1329729&r2=1329730&view=diff
==============================================================================
---
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
(original)
+++
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
Tue Apr 24 13:56:52 2012
@@ -92,9 +92,15 @@ public class Main extends MainSupport {
@Override
protected void doStop() throws Exception {
- super.doStop();
+ // stop camel context
+ if (camelContext != null) {
+ camelContext.stop();
+ }
+ // and then stop blueprint
LOG.debug("Stopping Blueprint XML file: " + descriptors);
CamelBlueprintHelper.disposeBundleContext(bundleContext);
+ // call completed to properly stop as we count down the waiting latch
+ completed();
}
@Override