camel git commit: CAMEL-11607: Fix npe in MBeanInfoAssembler when debug is enabled.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 504c70ab2 -> b80470685


CAMEL-11607: Fix npe in MBeanInfoAssembler when debug is enabled.

If debug is enabled and cache is not initialised an npe is thrown
when stopping the component.

Conflicts:
        
camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java


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

Branch: refs/heads/camel-2.19.x
Commit: b80470685c4285c095ad7a471a6f048ab80d012d
Parents: 504c70a
Author: sarelp <sa...@yannitech.com>
Authored: Thu Jul 27 15:06:36 2017 +1000
Committer: Andrea Cosentino <anco...@gmail.com>
Committed: Thu Jul 27 15:56:05 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/management/MBeanInfoAssembler.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b8047068/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java 
b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
index 09cbf89..de9c9f8 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
@@ -73,10 +73,12 @@ public class MBeanInfoAssembler implements Service {
 
     @Override
     public void stop() throws Exception {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Clearing cache[size={}, hits={}, misses={}, 
evicted={}]", new Object[]{cache.size(), cache.getHits(), cache.getMisses(), 
cache.getEvicted()});
+        if (cache != null) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Clearing cache[size={}, hits={}, misses={}, 
evicted={}]", new Object[]{cache.size(), cache.getHits(), cache.getMisses(), 
cache.getEvicted()});
+            }
+            cache.clear();
         }
-        cache.clear();
     }
 
     /**