Author: jboynes
Date: Fri Jul 19 03:15:47 2013
New Revision: 1504755
URL: http://svn.apache.org/r1504755
Log:
Check needs to happen after call to scan
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1504755&r1=1504754&r2=1504755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Jul 19
03:15:47 2013
@@ -1954,13 +1954,13 @@ public class ContextConfig implements Li
}
FragmentJarScannerCallback callback =
new FragmentJarScannerCallback(webXmlParser, delegate);
- if (!callback.isOk()) {
- ok = false;
- }
jarScanner.scan(JarScanType.PLUGGABILITY,
context.getServletContext(), callback);
+ if (!callback.isOk()) {
+ ok = false;
+ }
return callback.getFragments();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
