Author: nbelaevski
Date: 2010-05-15 10:26:04 -0400 (Sat, 15 May 2010)
New Revision: 17064
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java
Log:
AbstractAttachQueue: added instance check for handled system events
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java
===================================================================
---
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-05-15
14:25:19 UTC (rev 17063)
+++
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-05-15
14:26:04 UTC (rev 17064)
@@ -136,22 +136,24 @@
public void processEvent(ComponentSystemEvent event) throws AbortProcessingException
{
super.processEvent(event);
- String queueId = getClientId();
-
- if (componentsToAssociate != null) {
- for (UIComponent componentToAssociate : componentsToAssociate) {
- immediateAssociateWith(componentToAssociate, queueId);
+ if (event instanceof PostAddToViewEvent) {
+ String queueId = getClientId();
+
+ if (componentsToAssociate != null) {
+ for (UIComponent componentToAssociate : componentsToAssociate) {
+ immediateAssociateWith(componentToAssociate, queueId);
+ }
+
+ componentsToAssociate = null;
}
- componentsToAssociate = null;
- }
-
- if (behaviorsToAssociate != null) {
- for (AjaxBehavior ajaxBehavior : behaviorsToAssociate) {
- immediateAssociateWith(ajaxBehavior, queueId);
+ if (behaviorsToAssociate != null) {
+ for (AjaxBehavior ajaxBehavior : behaviorsToAssociate) {
+ immediateAssociateWith(ajaxBehavior, queueId);
+ }
+
+ behaviorsToAssociate = null;
}
-
- behaviorsToAssociate = null;
}
}
}