Index: catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java =================================================================== RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v retrieving revision 1.6 diff -u -r1.6 WebdavServlet.java --- catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 14 Nov 2003 10:16:22 -0000 1.6 +++ catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 16 Nov 2003 13:51:54 -0000 @@ -848,6 +847,11 @@ if (lockDurationStr == null) { lockDuration = DEFAULT_TIMEOUT; } else { + int commaPos = lockDurationStr.indexOf(","); + // If multiple timeouts, just use the first + if (commaPos != -1) { + lockDurationStr = lockDurationStr.substring(0,commaPos); + } if (lockDurationStr.startsWith("Second-")) { lockDuration = (new Integer(lockDurationStr.substring(7))).intValue();