You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2019/01/30 16:03:19 UTC
svn commit: r1852531 -
/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java
Author: coheigea
Date: Wed Jan 30 16:03:19 2019
New Revision: 1852531
URL: http://svn.apache.org/viewvc?rev=1852531&view=rev
Log:
WSS-643 - NullPointerException in getCacheManager
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java?rev=1852531&r1=1852530&r2=1852531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheManagerHolder.java Wed Jan 30 16:03:19 2019
@@ -103,15 +103,19 @@ public final class EHCacheManagerHolder
cacheManager = findDefaultCacheManager(confName, configFileURL);
}
}
- AtomicInteger a = COUNTS.get(cacheManager.getName());
- if (a == null) {
- COUNTS.putIfAbsent(cacheManager.getName(), new AtomicInteger());
- a = COUNTS.get(cacheManager.getName());
+ if (cacheManager != null && cacheManager.getName() != null) {
+ AtomicInteger a = COUNTS.get(cacheManager.getName());
+ if (a == null) {
+ COUNTS.putIfAbsent(cacheManager.getName(), new AtomicInteger());
+ a = COUNTS.get(cacheManager.getName());
+ }
+ a.incrementAndGet();
+ // if (a.incrementAndGet() == 1) {
+ //System.out.println("Create!! " + cacheManager.getName());
+ // }
+ } else {
+ LOG.warn("The CacheManager or CacheManager name was null");
}
- a.incrementAndGet();
- // if (a.incrementAndGet() == 1) {
- //System.out.println("Create!! " + cacheManager.getName());
- // }
return cacheManager;
}