Author: kkolinko
Date: Mon Dec 28 01:08:41 2015
New Revision: 1721866
URL: http://svn.apache.org/viewvc?rev=1721866&view=rev
Log:
Minor improvements in review of r1720769/r1720776/r1720783/r1720788
append(String) -> append(char)
No functional change.
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/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.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=1721866&r1=1721865&r2=1721866&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon Dec 28
01:08:41 2015
@@ -901,7 +901,7 @@ public final class CGIServlet extends Ht
}
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
- cginameBuilder.append("/").append(nextElement);
+ cginameBuilder.append('/').append(nextElement);
}
String cginame = cginameBuilder.toString();
if (!currentLocation.isFile()) {
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=1721866&r1=1721865&r2=1721866&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
Mon Dec 28 01:08:41 2015
@@ -83,7 +83,7 @@ public class CredentialHandlerRuleSet ex
StringBuilder pattern = new StringBuilder(prefix);
for (int i = 0; i < MAX_NESTED_LEVELS; i++) {
if (i > 0) {
- pattern.append("/");
+ pattern.append('/');
}
pattern.append("CredentialHandler");
addRuleInstances(digester, pattern.toString(), i == 0 ?
"setCredentialHandler"
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=1721866&r1=1721865&r2=1721866&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Mon Dec 28
01:08:41 2015
@@ -86,7 +86,7 @@ public class RealmRuleSet extends RuleSe
StringBuilder pattern = new StringBuilder(prefix);
for (int i = 0; i < MAX_NESTED_REALM_LEVELS; i++) {
if (i > 0) {
- pattern.append("/");
+ pattern.append('/');
}
pattern.append("Realm");
addRuleInstances(digester, pattern.toString(), i == 0 ? "setRealm"
: "addRealm");
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1721866&r1=1721865&r2=1721866&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Mon Dec 28
01:08:41 2015
@@ -514,14 +514,16 @@ public class XByteBuffer {
return -1;
//assume it does exist
found = true;
- for (int i = 1; ( (i < findlen) && found); i++)
+ for (int i = 1; ( (i < findlen) && found); i++) {
found = (find[i] == src[pos + i]);
- if (found)
+ }
+ if (found) {
result = pos;
- else if ( (srclen - pos) < findlen)
+ } else if ( (srclen - pos) < findlen) {
return -1; //no more matches possible
- else
+ } else {
pos++;
+ }
}
return result;
}
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=1721866&r1=1721865&r2=1721866&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Mon Dec
28 01:08:41 2015
@@ -542,7 +542,6 @@ public class JspRuntimeLibrary {
* @param unescString The string to shell-escape
* @return The escaped shell string.
*/
-
public static String escapeQueryString(String unescString) {
if (unescString == null) {
return null;
@@ -555,7 +554,7 @@ public class JspRuntimeLibrary {
char nextChar = unescString.charAt(index);
if (shellSpChars.indexOf(nextChar) != -1) {
- escStringBuilder.append("\\");
+ escStringBuilder.append('\\');
}
escStringBuilder.append(nextChar);
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=1721866&r1=1721865&r2=1721866&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 Mon
Dec 28 01:08:41 2015
@@ -41,12 +41,12 @@ public class HttpParser {
static {
// Setup the flag arrays
for (int i = 0; i < 128; i++) {
- if (i < 32) {
+ if (i <= 32) { // includes '\t' and ' '
isToken[i] = false;
} else if (i == '(' || i == ')' || i == '<' || i == '>' || i ==
'@' ||
i == ',' || i == ';' || i == ':' || i == '\\' || i ==
'\"' ||
i == '/' || i == '[' || i == ']' || i == '?' || i ==
'=' ||
- i == '{' || i == '}' || i == ' ') {
+ i == '{' || i == '}') {
isToken[i] = false;
} else {
isToken[i] = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
