This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2427059b2b BZ 69359: WebdavServlet duplicates getRelativePath() method
from super class with incorrect Javadoc
2427059b2b is described below
commit 2427059b2bc9629f9d53198be3ce0f607ee1bdb6
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Wed Oct 2 10:18:36 2024 +0200
BZ 69359: WebdavServlet duplicates getRelativePath() method from super
class with incorrect Javadoc
---
java/org/apache/catalina/servlets/WebdavServlet.java | 5 -----
webapps/docs/changelog.xml | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index dfe0461c9f..d32868a9b3 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -410,11 +410,6 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
*
* @param request The servlet request we are processing
*/
- @Override
- protected String getRelativePath(HttpServletRequest request) {
- return getRelativePath(request, false);
- }
-
@Override
protected String getRelativePath(HttpServletRequest request, boolean
allowEmptyPath) {
String pathInfo;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b30a554613..ca652cd604 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,11 @@
Remove default value (was <code>catalina</code>) for the
<code>secret</code> init parameter of the WebDAV Servlet. (remm)
</update>
+ <fix>
+ <bug>69359</bug>: <code>WebdavServlet</code> duplicates
+ <code>getRelativePath()</code> method from super class with
+ incorrect Javadoc. (michaelo)
+ </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
