[camel] 01/02: Fixed potential NPE

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit bb6f83806ba5d17df32f1b31cbad8c7c47f870c9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 5 10:45:29 2018 +0200

    Fixed potential NPE
---
 .../src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index 59344ae..3b9df02 100644
--- 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -410,7 +410,7 @@ public abstract class CamelTestSupport extends TestSupport {
 
     @After
     public void tearDown() throws Exception {
-        long time = watch.stop();
+        long time = watch.taken();
 
         
log.info("********************************************************************************");
         log.info("Testing done: " + getTestMethodName() + "(" + 
getClass().getName() + ")");
@@ -422,7 +422,7 @@ public abstract class CamelTestSupport extends TestSupport {
             String dir = "target/camel-route-coverage";
             String name = className + "-" + getTestMethodName() + ".xml";
 
-            ManagedCamelContextMBean managedCamelContext = 
context.getManagedCamelContext();
+            ManagedCamelContextMBean managedCamelContext = context != null ? 
context.getManagedCamelContext() : null;
             if (managedCamelContext == null) {
                 log.warn("Cannot dump route coverage to file as JMX is not 
enabled. Override useJmx() method to enable JMX in the unit test classes.");
             } else {

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.