svn commit: r1580591 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

[ma...@apache.org]

Author: markt
Date: Sun Mar 23 20:16:24 2014
New Revision: 1580591

URL: http://svn.apache.org/r1580591
Log:
Minor clean-up

Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1580591&r1=1580590&r2=1580591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sun Mar 23 20:16:24 2014
@@ -2527,12 +2527,14 @@ public class WebappClassLoader extends U
             return null;
         }
 
-        if ((name == null) || (path == null))
+        if (name == null || path == null) {
             return null;
+        }
 
         ResourceEntry entry = resourceEntries.get(path);
-        if (entry != null)
+        if (entry != null) {
             return entry;
+        }
 
         boolean isClassResource = path.endsWith(CLASS_FILE_SUFFIX);
 
@@ -2551,10 +2553,8 @@ public class WebappClassLoader extends U
         entry.codeBase = entry.source;
         entry.lastModified = resource.getLastModified();
 
-        if (needConvert) {
-            if (path.endsWith(".properties")) {
-                fileNeedConvert = true;
-            }
+        if (needConvert && path.endsWith(".properties")) {
+            fileNeedConvert = true;
         }
 
         /* Only cache the binary content if there is some content
@@ -2629,7 +2629,6 @@ public class WebappClassLoader extends U
         }
 
         return entry;
-
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org