commit 12ed8b916da076379247b4189521ec1dc8adbc47
author Thomas Vandahl <tv@apache.org> Sun Apr 12 20:31:28 2020 +0200
committer Thomas Vandahl <tv@apache.org> Sun Apr 12 20:31:28 2020 +0200
tree bc8449ecf458d8d0440fa47e15f8e95b7871758d
parent 670642e371c9eebbe7d1cbec001b993cc59e7fbf

Fix potential NPE

commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java

diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
index 7f50bcb..1d29b56 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
@@ -591,7 +591,10 @@
         synchronized (CompositeCacheManager.class)
         {
             // shutdown element event queue
-            this.elementEventQueue.dispose();
+            if (this.elementEventQueue != null)
+            {
+                this.elementEventQueue.dispose();
+            }
 
             // shutdown all scheduled jobs
             this.scheduledExecutor.shutdownNow();