tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1384566 - /tomcat/sandbox/trunk-resources/java/org/apache/catalina/loader/WebappClassLoader.java
Date Thu, 13 Sep 2012 22:13:15 GMT
Author: markt
Date: Thu Sep 13 22:13:15 2012
New Revision: 1384566

URL: http://svn.apache.org/viewvc?rev=1384566&view=rev
Log:
Fix some unit test failures with latest resources implementation

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

Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1384566&r1=1384565&r2=1384566&view=diff
==============================================================================
--- tomcat/sandbox/trunk-resources/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/loader/WebappClassLoader.java
Thu Sep 13 22:13:15 2012
@@ -1085,11 +1085,13 @@ public class WebappClassLoader
 
         int jarFilesLength = jarFiles.length;
 
-        // Looking at the repository
-        WebResource[] webResources = resources.getResources(repository + name);
-        for (WebResource webResource : webResources) {
-            if (webResource.exists()) {
-                result.add(webResource.getURL());
+        if (repository != null) {
+            // Looking at the repository
+            WebResource[] webResources = resources.getResources(repository + name);
+            for (WebResource webResource : webResources) {
+                if (webResource.exists()) {
+                    result.add(webResource.getURL());
+                }
             }
         }
 



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


Mime
View raw message