Mojarra issue 5171

[BalusC]

#5171

[NicolaIsotta]

Hi @BalusC
Testing locally I found out the fix can be simplified.
Adding this override to ContextualCompositeValueExpression:

@Override
public ValueReference getValueReference(ELContext elContext) {

    FacesContext ctx = (FacesContext) elContext.getContext(FacesContext.class);
    boolean pushed = pushCompositeComponent(ctx);
    try {
        return originalVE.getValueReference(elContext);
    } finally {
        if (pushed) {
            popCompositeComponent(ctx);
        }
    }

}

InterceptingResolver in ValueExpressionAnalyzer is not needed anymore, so getReference can be simplified this way:

public ValueReference getReference(ELContext elContext) {
    ValueReference reference = expression.getValueReference(elContext);
    if (reference != null) {
        Object base = reference.getBase();
        if (base instanceof CompositeComponentExpressionHolder) {
            ValueExpression ve = ((CompositeComponentExpressionHolder) base).getExpression(String.valueOf(reference.getProperty()));
            if (ve != null) {
                expression = ve;
                reference = getReference(elContext);
            }
        }
    }
    return reference;
}

I can make a PR if needed, let me know

[BalusC]

I'll adjust the PR and re-test when time allows me.

[BalusC]

Thank you very much, @NicolaIsotta , I've been able to get rid of the ValueExpressionAnalyzer completely with your insightful suggestion! The PR has been updated.

[BalusC]

4.0 branch was split off from master after this PR was created and then master became 4.1 but the PR wasn't updated to retarget 4.0.

New PR created for 4.0: #5177