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:45:34 UTC
svn commit: r1491847 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
Author: lu4242
Date: Tue Jun 11 15:45:33 2013
New Revision: 1491847
URL: http://svn.apache.org/r1491847
Log:
MYFACES-3735 NullPointerException in CompositeMetadataTargetImpl.<init>
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java?rev=1491847&r1=1491846&r2=1491847&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java Tue Jun 11 15:45:33 2013
@@ -143,9 +143,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
{
@@ -162,7 +162,7 @@ public final class CompositeComponentDef
Collection<String> declaredDefaultValues = null;
- for (PropertyDescriptor pd : _cachedBeanInfo.getPropertyDescriptors())
+ for (PropertyDescriptor pd : tempBeanInfo.getPropertyDescriptors())
{
if (pd.getValue("default") != null)
{
@@ -177,12 +177,14 @@ public final class CompositeComponentDef
{
declaredDefaultValues = Collections.emptyList();
}
- _cachedBeanInfo.getBeanDescriptor().
+ tempBeanInfo.getBeanDescriptor().
setValue(UIComponent.ATTRS_WITH_DECLARED_DEFAULT_VALUES, declaredDefaultValues);
}
finally
{
mctx.popCompositeComponentToStack();
+
+ _cachedBeanInfo = tempBeanInfo;
}
}
else