[camel] branch master updated: Fixed micrometer 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


The following commit(s) were added to refs/heads/master by this push:
     new 12d5ca8  Fixed micrometer NPE
12d5ca8 is described below

commit 12d5ca89c955d3b41a62b5eeb4e7d7e94e14aba1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 20 11:16:33 2019 +0200

    Fixed micrometer NPE
---
 .../messagehistory/MicrometerMessageHistoryFactory.java           | 8 +++++++-
 .../ExceptionRouteMicrometerMessageHistoryTest.java               | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryFactory.java
 
b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryFactory.java
index 0b56a25..eb2f582 100644
--- 
a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryFactory.java
+++ 
b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelContextAware;
 import org.apache.camel.MessageHistory;
 import org.apache.camel.NamedNode;
 import org.apache.camel.NonManagedService;
+import org.apache.camel.Route;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.StaticService;
 import org.apache.camel.component.micrometer.MicrometerUtils;
@@ -102,7 +103,12 @@ public class MicrometerMessageHistoryFactory extends 
ServiceSupport implements C
 
     @Override
     public MessageHistory newMessageHistory(String routeId, NamedNode 
namedNode, long timestamp) {
-        return new MicrometerMessageHistory(getMeterRegistry(), 
camelContext.getRoute(routeId), namedNode, getNamingStrategy(), timestamp);
+        Route route = camelContext.getRoute(routeId);
+        if (route != null) {
+            return new MicrometerMessageHistory(getMeterRegistry(), route, 
namedNode, getNamingStrategy(), timestamp);
+        } else {
+            return null;
+        }
     }
 
     @Override
diff --git 
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java
 
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java
index c97f64b..281e286 100644
--- 
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java
+++ 
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java
@@ -56,7 +56,7 @@ public class ExceptionRouteMicrometerMessageHistoryTest 
extends CamelTestSupport
         assertMockEndpointsSatisfied();
 
         // there should be 3 names
-        assertEquals(5, registry.getMeters().size());
+        assertEquals(3, registry.getMeters().size());
 
         // get the message history service
         MicrometerMessageHistoryService service = 
context.hasService(MicrometerMessageHistoryService.class);
@@ -67,7 +67,6 @@ public class ExceptionRouteMicrometerMessageHistoryTest 
extends CamelTestSupport
 
         assertTrue(json.contains("\"nodeId\" : \"foo\""));
         assertTrue(json.contains("\"nodeId\" : \"bar\""));
-        assertTrue(json.contains("\"nodeId\" : \"exception\""));
     }
 
     @Override