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

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git

commit 12ed8b916da076379247b4189521ec1dc8adbc47
Author: Thomas Vandahl <[email protected]>
AuthorDate: Sun Apr 12 20:31:28 2020 +0200

    Fix potential NPE
---
 .../org/apache/commons/jcs/engine/control/CompositeCacheManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@ public class CompositeCacheManager
         synchronized (CompositeCacheManager.class)
         {
             // shutdown element event queue
-            this.elementEventQueue.dispose();
+            if (this.elementEventQueue != null)
+            {
+                this.elementEventQueue.dispose();
+            }
 
             // shutdown all scheduled jobs
             this.scheduledExecutor.shutdownNow();

Reply via email to