You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2010/03/03 20:42:38 UTC
svn commit: r918660 - in /myfaces/trinidad/branches/1.2.12.1.2-branch: ./
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
trini...
Author: arobinson74
Date: Wed Mar 3 19:42:37 2010
New Revision: 918660
URL: http://svn.apache.org/viewvc?rev=918660&view=rev
Log:
TRINIDAD-1738 - check into the 1.2.12.1.2 branch
Modified:
myfaces/trinidad/branches/1.2.12.1.2-branch/ (props changed)
myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.12.1.2-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 3 19:42:37 2010
@@ -1,6 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch:770843-770856,771372,785365
/myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
-/myfaces/trinidad/branches/1.2.12.2-branch:895708
+/myfaces/trinidad/branches/1.2.12.2-branch:895708,915963
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
Modified: myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=918660&r1=918659&r2=918660&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Wed Mar 3 19:42:37 2010
@@ -615,7 +615,7 @@
// _addTargets(_GLOBAL_TRIGGER);
// now do all listeners
- _addTargets(updated);
+ _addTargets(updated, new HashSet<UIComponent>());
}
}
@@ -787,27 +787,28 @@
return lifetimeObj.intValue();
}
- private void _addTargets(UIComponent key)
+ private void _addTargets(
+ UIComponent key,
+ Set<UIComponent> visitedComponents)
{
Map<UIComponent, Set<UIComponent>> pl = _getPartialListeners();
Set<UIComponent> listeners = pl.get(key);
- if (listeners != null)
+ if (listeners != null && !listeners.isEmpty())
{
- // protect from infinite recursion
- pl.remove(key);
+ // protect from infinite recursion by making sure we do not
+ // process the same component twice
+ if (!visitedComponents.add(key))
+ {
+ return;
+ }
- for(UIComponent listener : listeners)
+ for (UIComponent listener : listeners)
{
addPartialTarget(listener);
// This target will be re-rendered, re-render anything that's
// listening on it also.
- partialUpdateNotify(listener);
+ _addTargets(listener, visitedComponents);
}
-
- // TRINIDAD-1545
- // Re-add listeners to the map to accommodate partial targets for different stamps of
- // the same component
- pl.put(key, listeners);
}
}
Propchange: myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 3 19:42:37 2010
@@ -1,6 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299
-/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708,915963
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885
Propchange: myfaces/trinidad/branches/1.2.12.1.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 3 19:42:37 2010
@@ -1,6 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299
-/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708,915963
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885