Author: markt
Date: Mon Aug 17 21:40:41 2009
New Revision: 805153
URL: http://svn.apache.org/viewvc?rev=805153&view=rev
Log:
Fix NPE if something tries to access resources accessed during a stop.
This was seen when unpackWARs="false" and the JDBC clean up code tried to load
the leak prevention class during a context stop.
Modified:
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=805153&r1=805152&r2=805153&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Mon Aug 17
21:40:41 2009
@@ -797,7 +797,7 @@
* Entry tree lookup.
*/
protected Entry treeLookup(Name name) {
- if (name.isEmpty())
+ if (name.isEmpty() || entries == null)
return entries;
Entry currentEntry = entries;
for (int i = 0; i < name.size(); i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
