You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/06/02 20:58:58 UTC
svn commit: r950721 - in
/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension:
TobagoLabelExtensionHandler.java TobagoMenuExtensionHandler.java
Author: bommel
Date: Wed Jun 2 18:58:58 2010
New Revision: 950721
URL: http://svn.apache.org/viewvc?rev=950721&view=rev
Log:
(TOBAGO-888) tx:menuRadio may produce a ClassCastException on concurrent access
Modified:
myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=950721&r1=950720&r2=950721&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Wed Jun 2 18:58:58 2010
@@ -225,7 +225,7 @@ public abstract class TobagoLabelExtensi
}
protected MetaRuleset createSubComponentMetaRuleset(Class aClass) {
- MetaRuleset metaRuleset = createMetaRuleset(aClass);
+ MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
metaRuleset.ignore(Attributes.LABEL);
metaRuleset.ignore(Attributes.TIP);
metaRuleset.ignore("labelWidth");
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java?rev=950721&r1=950720&r2=950721&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java Wed Jun 2 18:58:58 2010
@@ -81,12 +81,12 @@ public abstract class TobagoMenuExtensio
subComponentLastType = type;
subComponentMapper = createSubComponentMetaRuleset(type).finish();
}
- this.subComponentMapper.applyMetadata(ctx, instance);
+ subComponentMapper.applyMetadata(ctx, instance);
}
}
protected MetaRuleset createSubComponentMetaRuleset(Class aClass) {
- MetaRuleset metaRuleset = createMetaRuleset(aClass);
+ MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
TagAttribute [] attrs = tag.getAttributes().getAll();
for (int i = 0; i < attrs.length; i++) {
TagAttribute attr = attrs[i];