Author: markt
Date: Fri Nov 27 12:05:27 2015
New Revision: 1716858
URL: http://svn.apache.org/viewvc?rev=1716858&view=rev
Log:
Port refactoring from super class
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1716858&r1=1716857&r2=1716858&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Fri Nov
27 12:05:27 2015
@@ -375,23 +375,24 @@ public class WebdavServlet
*/
@Override
protected String getRelativePath(HttpServletRequest request) {
- // Are we being processed by a RequestDispatcher.include()?
- if (request.getAttribute(
- RequestDispatcher.INCLUDE_REQUEST_URI) != null) {
- String result = (String) request.getAttribute(
- RequestDispatcher.INCLUDE_PATH_INFO);
- if ((result == null) || (result.equals("")))
- result = "/";
- return (result);
+ String pathInfo;
+
+ if (request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) !=
null) {
+ // For includes, get the info from the attributes
+ pathInfo = (String)
request.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
+ } else {
+ pathInfo = request.getPathInfo();
}
- // No, extract the desired path directly from the request
- String result = request.getPathInfo();
- if ((result == null) || (result.equals(""))) {
- result = "/";
+ StringBuilder result = new StringBuilder();
+ if (pathInfo != null) {
+ result.append(pathInfo);
+ }
+ if (result.length() == 0) {
+ result.append('/');
}
- return (result);
+ return result.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
