root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Remove String#toCharArray from ScriptUtils 

ScriptUtils contains two calls to String#toCharArray for the sole
purpose to iterating over all chars in a String. Not only is this
unnecessary and can be replaced with String#charAt it also causes
additional allocator and heap pressure because String#toCharArray
rather than returning the backing array (which is gone in Java 9)
creates a copy.

This commit contains the following changes:

 - remove String#toCharArray from ScriptUtils and replace with
   String#charAt

Issue: SPR-15075
This commit is contained in:
Philippe Marschall 2016-12-31 10:00:30 +01:00 committed by Stephane Nicoll
parent 7f05c2a18c
commit 131d2c2051
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
View File

@ -178,9 +178,8 @@ public abstract class ScriptUtils {
boolean inSingleQuote = false; boolean inSingleQuote = false;
boolean inDoubleQuote = false; boolean inDoubleQuote = false;
boolean inEscape = false; boolean inEscape = false;
char[] content = script.toCharArray();
for (int i = 0; i < script.length(); i++) { for (int i = 0; i < script.length(); i++) {
char c = content[i]; char c = script.charAt(i);
if (inEscape) { if (inEscape) {
inEscape = false; inEscape = false;
sb.append(c); sb.append(c);
@ -342,9 +341,8 @@ public abstract class ScriptUtils {
*/ */
public static boolean containsSqlScriptDelimiters(String script, String delim) { public static boolean containsSqlScriptDelimiters(String script, String delim) {
boolean inLiteral = false; boolean inLiteral = false;
char[] content = script.toCharArray();
for (int i = 0; i < script.length(); i++) { for (int i = 0; i < script.length(); i++) {
if (content[i] == '\'') { if (script.charAt(i) == '\'') {
inLiteral = !inLiteral; inLiteral = !inLiteral;
} }
if (!inLiteral && script.startsWith(delim, i)) { if (!inLiteral && script.startsWith(delim, i)) {