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 2013/06/11 17:29:15 UTC
svn commit: r1491838 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
Author: lu4242
Date: Tue Jun 11 15:29:14 2013
New Revision: 1491838
URL: http://svn.apache.org/r1491838
Log:
MYFACES-3735 NullPointerException in CompositeMetadataTargetImpl.<init>
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java?rev=1491838&r1=1491837&r2=1491838&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java Tue Jun 11 15:29:14 2013
@@ -139,9 +139,9 @@ public final class CompositeComponentDef
{
if (_cachedBeanInfo == null)
{
- _cachedBeanInfo = _createCompositeComponentMetadata(ctx, compositeBaseParent);
+ tempBeanInfo = _createCompositeComponentMetadata(ctx, compositeBaseParent);
compositeBaseParent.getAttributes().put(
- UIComponent.BEANINFO_KEY, _cachedBeanInfo);
+ UIComponent.BEANINFO_KEY, tempBeanInfo);
try
{
@@ -159,6 +159,8 @@ public final class CompositeComponentDef
finally
{
mctx.popCompositeComponentToStack();
+
+ _cachedBeanInfo = tempBeanInfo;
}
}
else