Adjusting regex captures and adjusting logic for skipping escaping

Adobe-Consulting-Services · May 14, 2021 · 51c86f6 · 51c86f6
1 parent 2264a1b
commit 51c86f6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bundle/src/main/java/com/adobe/acs/commons/ccvar/util/ContentVariableReplacementUtil.java b/bundle/src/main/java/com/adobe/acs/commons/ccvar/util/ContentVariableReplacementUtil.java
@@ -36,7 +36,7 @@
  */
 public class ContentVariableReplacementUtil {
 
-    private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\{\\{([a-zA-Z0-9_:\\-]+\\.[a-zA-Z0-9_:\\-]+(\\|?[a-zA-Z0-9_:\\-]*))}}");
+    private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\{\\{([a-zA-Z0-9_:\\-]+\\.[a-zA-Z0-9_:\\-]+(\\|[a-zA-Z0-9_:\\-]*)?)}}");
     private static final Map<String, String> REQUIRED_ESCAPE = escapeMap();
     private static final String PLACEHOLDER_BEGIN = "{{";
     private static final String PLACEHOLDER_END = "}}";
@@ -117,7 +117,7 @@ public static List<String> getKeys(String string) {
      */
     public static String doReplacement(String input, String key, String replacement, TransformAction action) {
         if (action != null) {
-            if (!action.disableEscaping()) {
+            if (action.disableEscaping()) {
                 return input.replace(getPlaceholder(key), action.execute(replacement));
             }
             return input.replace(getPlaceholder(key), baseEscaping(action.execute(replacement)));