tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r393882 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Date Thu, 13 Apr 2006 18:46:25 GMT
Author: yoavs
Date: Thu Apr 13 11:46:19 2006
New Revision: 393882

URL: http://svn.apache.org/viewcvs?rev=393882&view=rev
Log:
Bugzilla 38154: http://issues.apache.org/bugzilla/show_bug.cgi?id=38154

Modified:
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java?rev=393882&r1=393881&r2=393882&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Thu Apr 13 11:46:19 2006
@@ -838,6 +838,11 @@
             if (canPath == null)
                 return null;
 
+            // Bugzilla 38154: after release() the absoluteBase is null, leading to an NPE
+            if (absoluteBase == null) {
+                return null;
+            }
+
             // Check to see if going outside of the web application root
             if (!canPath.startsWith(absoluteBase)) {
                 return null;

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393882&r1=393881&r2=393882&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 11:46:19 2006
@@ -65,6 +65,9 @@
       <fix>
         <bug>38194</bug>: Don't fail silently if -force is used without CATALINA_PID,
submitted by Matthew Buckett. (yoavs)
       </fix>
+      <fix>
+        <bug>38154</bug>: Avoid NPE in FileDirContext after webapp undeploy,
reported by Jamie Maher. (yoavs)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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


Mime
View raw message