Author: remy.maucherat(a)jboss.com Date: 2011-06-14 10:56:59 -0400 (Tue, 14 Jun 2011) New Revision: 1739 Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java trunk/webapps/docs/changelog.xml Log: - 51348: port NPE lock fix. Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java =================================================================== --- trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2011-06-10 14:49:38 UTC (rev 1738) +++ trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2011-06-14 14:56:59 UTC (rev 1739) @@ -1282,7 +1282,7 @@ LockInfo toRenew = resourceLocks.get(path); Enumeration<String> tokenList = null; - if (lock != null) { + if (toRenew != null) { // At least one of the tokens of the locks must have been given Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2011-06-10 14:49:38 UTC (rev 1738) +++ trunk/webapps/docs/changelog.xml 2011-06-14 14:56:59 UTC (rev 1739) @@ -22,6 +22,9 @@ <fix> <bug>51324</bug>: Recycle should reset the OutputBuffer doFlush flag. (remm) </fix> + <fix> + <bug>51348</bug>: WebDAV lock processing NPE fix. (markt) + </fix> </changelog> </subsection> </section>