Author: kkolinko
Date: Fri Apr 30 03:49:40 2010
New Revision: 939551
URL: http://svn.apache.org/viewvc?rev=939551&view=rev
Log:
Log unexpected runtima and IO errors in ApplicationContext#getResource() and
ApplicationContext#getResourceAsStream(). This is inspired by BZ 49218.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=939551&r1=939550&r2=939551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Apr
30 03:49:40 2010
@@ -507,8 +507,12 @@ public class ApplicationContext
return new URL
("jndi", "", 0, getJNDIUri(hostName, fullPath),
new DirContextURLStreamHandler(resources));
- } catch (Exception e) {
+ } catch (NamingException e) {
// Ignore
+ } catch (Exception e) {
+ // Unexpected
+ log(sm.getString("applicationContext.lookup.error", path,
+ getContextPath()), e);
}
}
@@ -543,8 +547,12 @@ public class ApplicationContext
Object resource = resources.lookup(normalizedPath);
if (resource instanceof Resource)
return (((Resource) resource).streamContent());
- } catch (Exception e) {
+ } catch (NamingException e) {
// Ignore
+ } catch (Exception e) {
+ // Unexpected
+ log(sm.getString("applicationContext.lookup.error", path,
+ getContextPath()), e);
}
}
return (null);
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=939551&r1=939550&r2=939551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Apr
30 03:49:40 2010
@@ -30,6 +30,7 @@ applicationContext.addSessionCookieConfi
applicationContext.setSessionTracking.ise=The session tracking modes for
context {0} cannot be set whilst the context is running
applicationContext.setSessionTracking.iae.invalid=The session tracking mode
{0} requested for context {1} is not supported by that context
applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {1} included SSL and at least one other mode. SSL may not
be configured with other modes.
+applicationContext.lookup.error=Failed to locate resource [{0}] in context
[{1}]
applicationDispatcher.allocateException=Allocate exception for servlet {0}
applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
applicationDispatcher.forward.ise=Cannot forward after response has been
committed
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
