[camel] branch main updated: CAMEL-16804: null check in MainConfigurationPro...

[zr...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 623115a  CAMEL-16804: null check in MainConfigurationPro...
623115a is described below

commit 623115a24391c65e92c116ed918950b8e1ead912
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Jul 15 12:54:32 2021 +0200

    CAMEL-16804: null check in MainConfigurationPro...
    
    ...perties
---
 .../org/apache/camel/main/MainConfigurationProperties.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index a36a67f4..445b9e2 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -85,10 +85,14 @@ public class MainConfigurationProperties extends DefaultConfigurationProperties<
             restConfigurationProperties.close();
             restConfigurationProperties = null;
         }
-        routesBuilders.clear();
-        routesBuilders = null;
-        configurations.clear();
-        configurations = null;
+        if (routesBuilders != null) {
+            routesBuilders.clear();
+            routesBuilders = null;
+        }
+        if (configurations != null) {
+            configurations.clear();
+            configurations = null;
+        }
     }
 
     // extended