Merge pull request #5311 from eclipse-ee4j/faces_issue_1567_regression_fix

Fixed regression error which caused spec1567IT to fail; the composite instance is needed further down in ComponentNotFoundException block

Author: arjantijms

impl/src/main/java/com/sun/faces/renderkit/html_basic/AjaxBehaviorRenderer.java

@@ -319,7 +319,7 @@ private static void appendIds(FacesContext facesContext,
 
         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) {
@@ -336,7 +336,7 @@ private static void appendIds(FacesContext facesContext,
 
             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;
             }