You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2015/11/06 04:18:07 UTC
svn commit: r1712905 - in /tomcat/trunk/java/org/apache: catalina/core/
catalina/realm/ catalina/servlets/ catalina/webresources/ jasper/compiler/
juli/ tomcat/util/net/
Author: kkolinko
Date: Fri Nov 6 03:18:07 2015
New Revision: 1712905
URL: http://svn.apache.org/viewvc?rev=1712905&view=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
String.lastIndexOf(String) -> String.lastIndexOf(char) where possible
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Nov 6 03:18:07 2015
@@ -346,7 +346,7 @@ public class ApplicationContext
if (file == null)
return (null);
- int period = file.lastIndexOf(".");
+ int period = file.lastIndexOf('.');
if (period < 0)
return (null);
String extension = file.substring(period + 1);
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Nov 6 03:18:07 2015
@@ -655,8 +655,8 @@ public abstract class RealmBase extends
for(int k=0; k < patterns.length && !matched; k++) {
String pattern = patterns[k];
if(pattern.startsWith("*.")){
- int slash = uri.lastIndexOf("/");
- int dot = uri.lastIndexOf(".");
+ int slash = uri.lastIndexOf('/');
+ int dot = uri.lastIndexOf('.');
if(slash >= 0 && dot > slash &&
dot != uri.length()-1 &&
uri.length()-dot == pattern.length()-1) {
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=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Nov 6 03:18:07 2015
@@ -1166,7 +1166,7 @@ public final class CGIServlet extends Ht
// create directories
String dirPath = destPath.toString().substring(
- 0,destPath.toString().lastIndexOf("/"));
+ 0,destPath.toString().lastIndexOf('/'));
File dir = new File(dirPath);
if (!dir.mkdirs() && !dir.isDirectory()) {
if (debug >= 2) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Fri Nov 6 03:18:07 2015
@@ -59,7 +59,7 @@ public class FileResource extends Abstra
// Need to return the mounted name, not the real name
int endOfName = webAppPath.length() - 1;
name = webAppPath.substring(
- webAppPath.lastIndexOf("/", endOfName - 1) + 1,
+ webAppPath.lastIndexOf('/', endOfName - 1) + 1,
endOfName);
}
} else {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java Fri Nov 6 03:18:07 2015
@@ -111,7 +111,7 @@ class ImplicitTagLibraryInfo extends Tag
*/
String suffix = path.endsWith(TAG_FILE_SUFFIX) ?
TAG_FILE_SUFFIX : TAGX_FILE_SUFFIX;
- String tagName = path.substring(path.lastIndexOf("/") + 1);
+ String tagName = path.substring(path.lastIndexOf('/') + 1);
tagName = tagName.substring(0,
tagName.lastIndexOf(suffix));
tagFileMap.put(tagName, path);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Fri Nov 6 03:18:07 2015
@@ -501,7 +501,7 @@ class ParserController implements TagCon
fileName = isAbsolute ? fileName
: baseDirStack.peek() + fileName;
String baseDir =
- fileName.substring(0, fileName.lastIndexOf("/") + 1);
+ fileName.substring(0, fileName.lastIndexOf('/') + 1);
baseDirStack.push(baseDir);
return fileName;
}
Modified: tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java Fri Nov 6 03:18:07 2015
@@ -57,7 +57,7 @@ public class JdkLoggerFormatter extends
if( name.indexOf('.') >= 0 )
- name = name.substring(name.lastIndexOf(".") + 1);
+ name = name.substring(name.lastIndexOf('.') + 1);
// Use a string buffer for better performance
StringBuilder buf = new StringBuilder();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1712905&r1=1712904&r2=1712905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Fri Nov 6 03:18:07 2015
@@ -140,7 +140,7 @@ public final class URL implements Serial
host = context.getHost();
port = context.getPort();
file = context.getFile();
- int question = file.lastIndexOf("?");
+ int question = file.lastIndexOf('?');
if (question < 0)
path = file;
else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org