You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/05/13 12:55:51 UTC
svn commit: r1594191 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
Author: lu4242
Date: Tue May 13 10:55:51 2014
New Revision: 1594191
URL: http://svn.apache.org/r1594191
Log:
MYFACES-3848 FunctionMapper not found when using a function inside value of f:setPropertyActionListener
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java?rev=1594191&r1=1594190&r2=1594191&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java Tue May 13 10:55:51 2014
@@ -166,7 +166,8 @@ final class DefaultFacelet extends Abstr
//Set FACELET_CONTEXT_KEY on FacesContext attribute map, to
//reflect the current facelet context instance
- facesContext.getAttributes().put(FaceletContext.FACELET_CONTEXT_KEY, ctx);
+ FaceletContext oldCtx = (FaceletContext)
+ facesContext.getAttributes().put(FaceletContext.FACELET_CONTEXT_KEY, ctx);
ctx.pushPageContext(new PageContextImpl());
@@ -230,6 +231,11 @@ final class DefaultFacelet extends Abstr
((EncodingHandler)_root).setUniqueIdList(uniqueIdList);
}
}
+
+ if (oldCtx != null)
+ {
+ facesContext.getAttributes().put(FaceletContext.FACELET_CONTEXT_KEY, oldCtx);
+ }
}
}