You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/28 21:54:11 UTC
[tomcat] 04/05: Align with 8.5.x. Backport LockInfo.maxDepth changes
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d582d86287bca6118da04033424193fde4ef0ce0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 21:42:48 2019 +0100
Align with 8.5.x. Backport LockInfo.maxDepth changes
---
java/org/apache/catalina/servlets/WebdavServlet.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index cd16cdd..2bf42bc 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -18,6 +18,7 @@ package org.apache.catalina.servlets;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
@@ -978,7 +979,7 @@ public class WebdavServlet extends DefaultServlet {
return;
}
- LockInfo lock = new LockInfo();
+ LockInfo lock = new LockInfo(maxDepth);
// Parsing lock request
@@ -2702,22 +2703,18 @@ public class WebdavServlet extends DefaultServlet {
/**
* Holds a lock information.
*/
- private class LockInfo {
+ private static class LockInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
- // -------------------------------------------------------- Constructor
-
-
- /**
- * Constructor.
- */
- public LockInfo() {
- // Ignore
+ public LockInfo(int maxDepth) {
+ this.maxDepth = maxDepth;
}
// ------------------------------------------------- Instance Variables
+ private final int maxDepth;
String path = "/";
String type = "write";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org