Prevent possible NPE when processing WebDAV locks.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1134048 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index a35d4c0..d08dbd0 100644 (file)
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1337,13 +1337,15 @@ public class WebdavServlet
             LockInfo toRenew = resourceLocks.get(path);
             Enumeration<String> tokenList = null;
 
-            // At least one of the tokens of the locks must have been given
-            tokenList = toRenew.tokens.elements();
-            while (tokenList.hasMoreElements()) {
-                String token = tokenList.nextElement();
-                if (ifHeader.indexOf(token) != -1) {
-                    toRenew.expiresAt = lock.expiresAt;
-                    lock = toRenew;
+            if (toRenew != null) {
+                // At least one of the tokens of the locks must have been given
+                tokenList = toRenew.tokens.elements();
+                while (tokenList.hasMoreElements()) {
+                    String token = tokenList.nextElement();
+                    if (ifHeader.indexOf(token) != -1) {
+                        toRenew.expiresAt = lock.expiresAt;
+                        lock = toRenew;
+                    }
                 }
             }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ecc8b17..9545dce 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,9 @@
         <bug>51344</bug>: Fix problem with Lifecycle re-factoring for deprecated
         embedded class that prevented events being triggered. (markt) 
       </fix>
+      <fix>
+        Prevent possible NPE when processing WebDAV locks. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">