Merge #5311 from 3.0 into 4.0

eclipse-ee4j · Sep 8, 2023 · 0921daa · 0921daa
2 parents f6e1295 + 2066346
commit 0921daa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/impl/src/main/java/com/sun/faces/renderkit/html_basic/AjaxBehaviorRenderer.java b/impl/src/main/java/com/sun/faces/renderkit/html_basic/AjaxBehaviorRenderer.java
@@ -294,7 +294,7 @@ private static void appendIds(FacesContext facesContext, UIComponent component,
 
         boolean first = true;
 
-        UIComponent composite = (ajaxBehavior instanceof RetargetedAjaxBehavior) ? UIComponent.getCompositeComponentParent(component) : null;
+        UIComponent composite = UIComponent.getCompositeComponentParent(component);
         String separatorChar = String.valueOf(getSeparatorChar(facesContext));
 
         for (String id : ids) {
@@ -311,7 +311,7 @@ private static void appendIds(FacesContext facesContext, UIComponent component,
 
             boolean clientResolveableExpression = expression.equals("@all") || expression.equals("@none") || expression.equals("@form") || expression.equals("@this");
 
-            if (composite != null && (expression.equals("@this") || expression.startsWith("@this" + separatorChar))) {
+            if (composite != null && (ajaxBehavior instanceof RetargetedAjaxBehavior) && (expression.equals("@this") || expression.startsWith("@this" + separatorChar))) {
                 expression = expression.replaceFirst("@this", separatorChar + composite.getClientId(facesContext));
                 clientResolveableExpression = false;
             }