Updated Branches:
  refs/heads/master df4210b37 -> 90e08bb30

Fixed potential NPE


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

Branch: refs/heads/master
Commit: 225e569681747b80fa3a20cdfdfae7fd691e4cd9
Parents: df4210b
Author: Claus Ibsen <davscl...@apache.org>
Authored: Fri Jul 19 14:30:36 2013 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Fri Jul 19 14:30:36 2013 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/util/ServiceHelper.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/225e5696/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
index d5f3b39..96dead5 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
@@ -58,10 +58,12 @@ public final class ServiceHelper {
     }
     
     /**
-     * Starts all of the given services
+     * Start the given service
      */
     public static void startService(Service service) throws Exception {
-        service.start();
+        if (service != null) {
+            service.start();
+        }
     }
 
     /**

Reply via email to