From b66efc63af5d39abcc363e8ee7d0b517446f73e2 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 6 Jan 2011 17:29:01 +0000 Subject: [PATCH] Fix a couple of FindBugs niggles git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1055951 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/catalina/servlets/WebdavServlet.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java index 4d0382a63..a35d4c0d3 100644 --- a/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/java/org/apache/catalina/servlets/WebdavServlet.java @@ -2706,18 +2706,23 @@ public class WebdavServlet @Override public String toString() { - String result = "Type:" + type + "\n"; - result += "Scope:" + scope + "\n"; - result += "Depth:" + depth + "\n"; - result += "Owner:" + owner + "\n"; - result += "Expiration:" - + FastHttpDateFormat.formatDate(expiresAt, null) + "\n"; + StringBuilder result = new StringBuilder("Type:"); + result.append(type); + result.append("\nScope:"); + result.append(scope); + result.append("\nDepth:"); + result.append(depth); + result.append("\nOwner:"); + result.append(owner); + result.append("\nExpiration:"); + result.append(FastHttpDateFormat.formatDate(expiresAt, null)); Enumeration tokensList = tokens.elements(); while (tokensList.hasMoreElements()) { - result += "Token:" + tokensList.nextElement() + "\n"; + result.append("\nToken:"); + result.append(tokensList.nextElement()); } - return result; - + result.append("\n"); + return result.toString(); } @@ -2797,7 +2802,7 @@ public class WebdavServlet * called with false. External references are filtered out for * security reasons. See CVE-2007-5461. */ - private class WebdavResolver implements EntityResolver { + private static class WebdavResolver implements EntityResolver { private ServletContext context; public WebdavResolver(ServletContext theContext) { -- 2.11.0