Fixed possible NPE when shutting down

xdev-software · May 17, 2024 · 044f8d3 · 044f8d3
1 parent d73e434
commit 044f8d3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
+# 1.0.2
+* Fixed possible NPE when shutting down
+
 # 1.0.1
 * Restore original logging with SLF4j
 
 # 1.0.0
-<i>Initial release</i>
+_Initial release_
diff --git a/expiring-limited-cache/src/main/java/software/xdev/caching/ExpiringLimitedCache.java b/expiring-limited-cache/src/main/java/software/xdev/caching/ExpiringLimitedCache.java
@@ -173,11 +173,18 @@ protected void shutdownCleanupExecutorIfRequired()
 	{
 		if(this.cache.isEmpty())
 		{
+			if(this.cleanUpExecutor == null)
+			{
+				return;
+			}
 			synchronized(this.cleanUpExecutorLock)
 			{
 				LOG.trace("Shutting down cleanupExecutor");
-				this.cleanUpExecutor.shutdownNow();
-				this.cleanUpExecutor = null;
+				if(this.cleanUpExecutor != null)
+				{
+					this.cleanUpExecutor.shutdownNow();
+					this.cleanUpExecutor = null;
+				}
 			}
 		}
 	}