This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 7e68fa79dd BZ 69359: WebdavServlet duplicates getRelativePath() method 
from super class with incorrect Javadoc
7e68fa79dd is described below

commit 7e68fa79dde2090a7f69343ec3ee3c355ef463ad
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 0dbd2be2d9..35221a30c7 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -407,11 +407,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 4d9b158c2a..25726400ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,11 @@
         Avoid store config backup loss when storing one configuration more than
         once per second. (remm)
       </fix>
+      <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

Reply via email to