CCVAR: Fixed Same Attribute not updating correctly

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+### Fix
+
+- #3275 - CCVAR: Fixed Same Attribute not updating correctly.
+
 ## Added
 
 - #3333 - Use lodash embedded by ACS AEM Commons

bundle/src/main/java/com/adobe/acs/commons/rewriter/impl/ContentVariableTransformer.java

@@ -76,6 +76,7 @@ public void startElement(String uri, String localName, String quaName, Attribute
  (String) ContentVariableReplacementUtil.getValue(contentVariableReplacements, key);
  String newAttrValue = ContentVariableReplacementUtil.doReplacement(currentAttribute, key,
  replaceValue, propertyConfigService.getAction(key));
+ currentAttribute = newAttrValue;
  newAttrs.setValue(i, newAttrValue);
  }
  }

bundle/src/test/java/com/adobe/acs/commons/rewriter/impl/ContentVariableTransformerFactoryTest.java

@@ -220,6 +220,21 @@ public void testHrefReplacementNotEncoded() throws Exception {
  assertEquals("/content/page.html?title=inheritedValue", out.getValue(0));
  }
 
+ @Test
+ public void testMultipleAttributeReplacement() throws Exception {
+ reinitTransformer(true);
+
+ AttributesImpl attributes = new AttributesImpl();
+ attributes.addAttribute(null, "title", null, "CDATA", "((page_properties.jcr:title)) and ((inherited_page_properties.inheritedProperty))");
+ transformer.startElement(null, "a", null, attributes);
+
+ ArgumentCaptor<AttributesImpl> attributesCaptor = ArgumentCaptor.forClass(AttributesImpl.class);
+ verify(handler, atLeast(1)).startElement(isNull(String.class), eq("a"), isNull(String.class), attributesCaptor.capture());
+
+ Attributes out = attributesCaptor.getValue();
+ assertEquals("Arctic Surfing In Lofoten and inheritedValue", out.getValue(0));
+ }
+
  private void reinitTransformer(boolean defaultService) throws Exception {
  if (defaultService) {
  defaultService(context);