Author: markt
Date: Tue Jun 14 13:07:17 2011
New Revision: 1135548
URL: http://svn.apache.org/viewvc?rev=1135548&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
Prevent possible NPE when processing WebDAV locks
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1135548&r1=1135547&r2=1135548&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 13:07:17 2011
@@ -155,12 +155,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, jung, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
- Prevent possible NPE when processing WebDAV locks
- https://issues.apache.org/bugzilla/attachment.cgi?id=27140
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while
handleSESSION_CREATED is being processed.
-setMaxInactiveInterval is not added to DeltaRequest in
handleSESSION_CREATED.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1135548&r1=1135547&r2=1135548&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Jun 14 13:07:17 2011
@@ -1329,7 +1329,7 @@ public class WebdavServlet
LockInfo toRenew = (LockInfo) resourceLocks.get(path);
Enumeration tokenList = null;
- if (lock != null) {
+ if (toRenew != null) {
// At least one of the tokens of the locks must have been given
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1135548&r1=1135547&r2=1135548&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:07:17 2011
@@ -118,6 +118,9 @@
<bug>51315</bug>: Fix NPE when removing an authenticator valve from a
container. Patch provided by Violeta Georgieva. (markt)
</fix>
+ <fix>
+ <bug>51348</bug>: Fix possible NPE when processing WebDAV locks.
(markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
