Merge #5312 from 4.0 into 4.1

eclipse-ee4j · Sep 8, 2023 · c88283c · c88283c
2 parents cade998 + 4374385
commit c88283c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/facelets/tag/composite/RetargetedAjaxBehavior.java b/impl/src/main/java/com/sun/faces/facelets/tag/composite/RetargetedAjaxBehavior.java
@@ -28,6 +28,7 @@
 import jakarta.faces.event.AbortProcessingException;
 import jakarta.faces.event.AjaxBehaviorListener;
 import jakarta.faces.event.BehaviorEvent;
+import jakarta.faces.render.ClientBehaviorRenderer;
 
 /**
  * Basically represents {@code <f:ajax>} which is retargeted by {@code <cc:clientBehavior>} in {@code AjaxHandler} and checked in {@code AjaxBehaviorRenderer}.
@@ -47,7 +48,8 @@ public RetargetedAjaxBehavior(AjaxBehavior retargeted) {
 
     @Override
     public String getScript(ClientBehaviorContext behaviorContext) {
-        return retargeted.getScript(behaviorContext);
+        ClientBehaviorRenderer renderer = getRenderer(behaviorContext.getFacesContext());
+        return renderer != null ? renderer.getScript(behaviorContext, this) : null;
     }
 
     @Override