ARTEMIS-3816 Fix connection router null pointer dereferences

apache · May 10, 2022 · 7a03f58 · 7a03f58
1 parent d433f3b
commit 7a03f58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...erver/src/main/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouter.java b/...erver/src/main/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouter.java
@@ -176,7 +176,7 @@ public TargetResult getTarget(String key) {
          return localTarget;
       }
 
-      if (pool == null) {
+      if (policy == null || pool == null) {
          return TargetResult.REFUSED_USE_ANOTHER_RESULT;
       }
 

diff --git a/...rc/main/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterManager.java b/...rc/main/java/org/apache/activemq/artemis/core/server/routing/ConnectionRouterManager.java
@@ -186,7 +186,7 @@ private Policy deployPolicy(NamedPropertyConfiguration policyConfig, Pool pool)
 
       policy.init(policyConfig.getProperties());
 
-      if (policy.getTargetProbe() != null) {
+      if (pool != null && policy.getTargetProbe() != null) {
          pool.addTargetProbe(policy.getTargetProbe());
       }
 

diff --git a/...rver/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java b/...rver/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java
@@ -71,9 +71,11 @@ public void start() {
       if (persisted) {
          persistedCacheEntries = storageManager.getPersistedKeyValuePairs(id);
 
-         for (Map.Entry<String, PersistedKeyValuePair> cacheEntry : persistedCacheEntries.entrySet()) {
-            cache.put(cacheEntry.getKey(), cacheEntry.getValue().getValue());
-            logger.info(cacheEntry.toString());
+         if (persistedCacheEntries != null) {
+            for (Map.Entry<String, PersistedKeyValuePair> cacheEntry : persistedCacheEntries.entrySet()) {
+               cache.put(cacheEntry.getKey(), cacheEntry.getValue().getValue());
+               logger.info(cacheEntry.toString());
+            }
          }
       }