diff --git a/main/plugins/org.talend.librariesmanager/resources/java/routines/system/StringUtils.java b/main/plugins/org.talend.librariesmanager/resources/java/routines/system/StringUtils.java index 9866debc78..f9e20f901d 100644 --- a/main/plugins/org.talend.librariesmanager/resources/java/routines/system/StringUtils.java +++ b/main/plugins/org.talend.librariesmanager/resources/java/routines/system/StringUtils.java @@ -339,7 +339,7 @@ public class StringUtils { return null; // regex != null && src == null } else { // case 3: - if (replacement == null) { + if (replacement == null || entirelyMatch) { if ((caseSensitive && src.equals(search)) || (!caseSensitive && src.equalsIgnoreCase(search))) { // regex != null && src != null && replacement != null, and match the whole src return replacement; @@ -348,13 +348,8 @@ public class StringUtils { } } else { - // regex != null && src != null && replacement != null - if (entirelyMatch) { - return caseSensitive ? src.equals(search) : src.equalsIgnoreCase(search); - } else { - int flag = caseSensitive ? Pattern.LITERAL : Pattern.LITERAL | Pattern.CASE_INSENSITIVE; - return Pattern.compile(search, flag).matcher(src).replaceAll(Matcher.quoteReplacement(replacement)); - } + int flag = caseSensitive ? Pattern.LITERAL : Pattern.LITERAL | Pattern.CASE_INSENSITIVE; + return Pattern.compile(search, flag).matcher(src).replaceAll(Matcher.quoteReplacement(replacement)); } } }