Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1280 from marschall:SPR-15075

Browse Source 
* pr/1280:
  Remove String#toCharArray from ScriptUtils
This commit is contained in:
Stephane Nicoll
2017-01-03 18:02:10 +01:00
parent 1ab0916bed 35bd00beaf
commit d912f77a31
1 changed files with 2 additions and 4 deletions
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 inDoubleQuote = false;
boolean inEscape = false;
char[] content = script.toCharArray();
for (int i = 0; i < script.length(); i++) {
char c = content[i];
char c = script.charAt(i);
if (inEscape) {
inEscape = false;
sb.append(c);
@@ -342,9 +341,8 @@ public abstract class ScriptUtils {
*/
public static boolean containsSqlScriptDelimiters(String script, String delim) {
boolean inLiteral = false;
char[] content = script.toCharArray();
for (int i = 0; i < script.length(); i++) {
if (content[i] == '\'') {
if (script.charAt(i) == '\'') {
inLiteral = !inLiteral;
}
if (!inLiteral && script.startsWith(delim, i)) {