Updated Branches:
  refs/heads/camel-2.11.x 1c31c013e -> 2cbaf86b8

CAMEL-6504 fixed the IndexOutOfBoundsException when call Main with -h option


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cbaf86b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cbaf86b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cbaf86b

Branch: refs/heads/camel-2.11.x
Commit: 2cbaf86b8765f3d40c79b41deb1b899da8812d9c
Parents: 1c31c01
Author: Willem Jiang <ningji...@apache.org>
Authored: Wed Jul 3 10:14:34 2013 +0800
Committer: Willem Jiang <ningji...@apache.org>
Committed: Wed Jul 3 10:17:08 2013 +0800

----------------------------------------------------------------------
 camel-core/src/main/java/org/apache/camel/main/Main.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2cbaf86b/camel-core/src/main/java/org/apache/camel/main/Main.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java 
b/camel-core/src/main/java/org/apache/camel/main/Main.java
index 1a106dc..4cf17ce 100644
--- a/camel-core/src/main/java/org/apache/camel/main/Main.java
+++ b/camel-core/src/main/java/org/apache/camel/main/Main.java
@@ -111,7 +111,9 @@ public class Main extends MainSupport {
 
     protected void doStop() throws Exception {
         super.doStop();
-        getCamelContexts().get(0).stop();
+        if (getCamelContexts().size() > 0) {
+            getCamelContexts().get(0).stop();
+        }
     }
 
     protected ProducerTemplate findOrCreateCamelTemplate() {

Reply via email to