Author: kkolinko
Date: Tue Nov 18 19:08:54 2014
New Revision: 1640410
URL: http://svn.apache.org/r1640410
Log:
Further fix for BZ 57172 - followup to r1640087 (r1640084 in trunk).
Be consistent with "webappClassLoader.stopped" message handling and throw an
ISE from findResourceInternal
In all call chains (findClass() / findResource() public methods) there is a
checkStateForResourceLoading()/checkStateForClassLoading() check at the start
of that public method, so it is unlikely to hit an ISE here unless there is
some kind of race. Throwing an ISE is a more consistent behaviour, and calling
a common method is better than a custom rarely used if() block.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1640410&r1=1640409&r2=1640410&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue
Nov 18 19:08:54 2014
@@ -2524,10 +2524,7 @@ public abstract class WebappClassLoaderB
*/
protected ResourceEntry findResourceInternal(final String name, final
String path) {
- if (!state.isAvailable()) {
- log.info(sm.getString("webappClassLoader.stopped", name));
- return null;
- }
+ checkStateForResourceLoading(name);
if (name == null || path == null) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
