Author: fschumacher
Date: Sun Mar 13 11:12:47 2016
New Revision: 1734784
URL: http://svn.apache.org/viewvc?rev=1734784&view=rev
Log:
Replace usage of Map#putIfAbsent to comply with java 7
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1734784&r1=1734783&r2=1734784&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Sun Mar 13 11:12:47 2016
@@ -924,7 +924,9 @@ public abstract class WebappClassLoaderB
ResourceEntry entry = new ResourceEntry();
entry.lastModified = resource.getLastModified();
synchronized(resourceEntries) {
- resourceEntries.putIfAbsent(path, entry);
+ if (!resourceEntries.containsKey(path)) {
+ resourceEntries.put(path, entry);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
