Author: violetagg
Date: Fri Dec 18 12:36:35 2015
New Revision: 1720769
URL: http://svn.apache.org/viewvc?rev=1720769&view=rev
Log:
Fixed findbugs issues:
- Concatenates strings using + in a loop
- Useless condition
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Dec 18
12:36:35 2015
@@ -870,7 +870,6 @@ public final class CGIServlet extends Ht
String path = null;
String name = null;
String scriptname = null;
- String cginame = "";
if ((webAppRootDir != null)
&& (webAppRootDir.lastIndexOf(File.separator) ==
@@ -895,14 +894,16 @@ public final class CGIServlet extends Ht
if (debug >= 3) {
log("findCGI: currentLoc=" + currentLocation);
}
+ StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
if (debug >= 3) {
log("findCGI: currentLoc=" + currentLocation);
}
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
- cginame = cginame + "/" + nextElement;
+ cginameBuilder.append("/").append(nextElement);
}
+ String cginame = cginameBuilder.toString();
if (!currentLocation.isFile()) {
return new String[] { null, null, null, null };
}
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
Fri Dec 18 12:36:35 2015
@@ -80,29 +80,21 @@ public class CredentialHandlerRuleSet ex
*/
@Override
public void addRuleInstances(Digester digester) {
-
- String pattern = prefix;
-
+ StringBuilder pattern = new StringBuilder(prefix);
for (int i = 0; i < MAX_NESTED_LEVELS; i++) {
-
if (i > 0) {
- pattern += "/";
- }
- pattern += "CredentialHandler";
-
- digester.addObjectCreate(pattern,
- null, // MUST be specified in the element,
- "className");
- digester.addSetProperties(pattern);
- if (i == 0) {
- digester.addSetNext(pattern,
- "setCredentialHandler",
- "org.apache.catalina.CredentialHandler");
- } else {
- digester.addSetNext(pattern,
- "addCredentialHandler",
- "org.apache.catalina.CredentialHandler");
+ pattern.append("/");
}
+ pattern.append("CredentialHandler");
+ addRuleInstances(digester, pattern.toString(), i == 0 ?
"setCredentialHandler"
+ : "addCredentialHandler");
}
}
+
+ private void addRuleInstances(Digester digester, String pattern, String
methodName) {
+ digester.addObjectCreate(pattern, null /* MUST be specified in the
element */,
+ "className");
+ digester.addSetProperties(pattern);
+ digester.addSetNext(pattern, methodName,
"org.apache.catalina.CredentialHandler");
+ }
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Fri Dec 18
12:36:35 2015
@@ -83,30 +83,21 @@ public class RealmRuleSet extends RuleSe
*/
@Override
public void addRuleInstances(Digester digester) {
-
- String pattern = prefix;
-
+ StringBuilder pattern = new StringBuilder(prefix);
for (int i = 0; i < MAX_NESTED_REALM_LEVELS; i++) {
-
if (i > 0) {
- pattern += "/";
+ pattern.append("/");
}
- pattern += "Realm";
-
- digester.addObjectCreate(pattern,
- null, // MUST be specified in the element,
- "className");
- digester.addSetProperties(pattern);
- if (i == 0) {
- digester.addSetNext(pattern,
- "setRealm",
- "org.apache.catalina.Realm");
- } else {
- digester.addSetNext(pattern,
- "addRealm",
- "org.apache.catalina.Realm");
- }
- digester.addRuleSet(new CredentialHandlerRuleSet(pattern + "/"));
+ pattern.append("Realm");
+ addRuleInstances(digester, pattern.toString(), i == 0 ? "setRealm"
: "addRealm");
}
}
+
+ private void addRuleInstances(Digester digester, String pattern, String
methodName) {
+ digester.addObjectCreate(pattern, null /* MUST be specified in the
element */,
+ "className");
+ digester.addSetProperties(pattern);
+ digester.addSetNext(pattern, methodName, "org.apache.catalina.Realm");
+ digester.addRuleSet(new CredentialHandlerRuleSet(pattern + "/"));
+ }
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Fri Dec
18 12:36:35 2015
@@ -544,21 +544,23 @@ public class JspRuntimeLibrary {
*/
public static String escapeQueryString(String unescString) {
- if ( unescString == null )
- return null;
-
- String escString = "";
- String shellSpChars = "&;`'\"|*?~<>^()[]{}$\\\n";
-
- for(int index=0; index<unescString.length(); index++) {
- char nextChar = unescString.charAt(index);
-
- if( shellSpChars.indexOf(nextChar) != -1 )
- escString += "\\";
-
- escString += nextChar;
- }
- return escString;
+ if (unescString == null) {
+ return null;
+ }
+
+ StringBuilder escStringBuilder = new StringBuilder();
+ String shellSpChars = "&;`'\"|*?~<>^()[]{}$\\\n";
+
+ for (int index = 0; index < unescString.length(); index++) {
+ char nextChar = unescString.charAt(index);
+
+ if (shellSpChars.indexOf(nextChar) != -1) {
+ escStringBuilder.append("\\");
+ }
+
+ escStringBuilder.append(nextChar);
+ }
+ return escStringBuilder.toString();
}
// __begin lookupReadMethodMethod
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Fri
Dec 18 12:36:35 2015
@@ -157,7 +157,7 @@ public class XMLEncodingDetector {
// Special case UTF-8 files with BOM created by Microsoft
// tools. It's more efficient to consume the BOM than make
// the reader perform extra checks. -Ac
- if (count > 2 && encoding.equals("UTF-8")) {
+ if (encoding.equals("UTF-8")) {
int b0 = b4[0] & 0xFF;
int b1 = b4[1] & 0xFF;
int b2 = b4[2] & 0xFF;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1720769&r1=1720768&r2=1720769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Fri
Dec 18 12:36:35 2015
@@ -46,7 +46,7 @@ public class HttpParser {
} else if (i == '(' || i == ')' || i == '<' || i == '>' || i ==
'@' ||
i == ',' || i == ';' || i == ':' || i == '\\' || i ==
'\"' ||
i == '/' || i == '[' || i == ']' || i == '?' || i ==
'=' ||
- i == '{' || i == '}' || i == ' ' || i == '\t') {
+ i == '{' || i == '}' || i == ' ') {
isToken[i] = false;
} else {
isToken[i] = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
