You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/25 18:43:10 UTC
svn commit: r1001267 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
Author: jakobk
Date: Sat Sep 25 16:43:10 2010
New Revision: 1001267
URL: http://svn.apache.org/viewvc?rev=1001267&view=rev
Log:
compareAnnotations() must recreate targetAnnotationIterator for each run of the outer loop
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java?rev=1001267&r1=1001266&r2=1001267&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java Sat Sep 25 16:43:10 2010
@@ -337,7 +337,6 @@ public class JsfWindowContext implements
Set<Annotation> targetAnnotations = new HashSet<Annotation>(target);
Iterator<Annotation> sourceAnnotationIterator = sourceAnnotations.iterator();
- Iterator<Annotation> targetAnnotationIterator = targetAnnotations.iterator();
Annotation sourceAnnotation;
Annotation targetAnnotation;
@@ -346,7 +345,8 @@ public class JsfWindowContext implements
while(sourceAnnotationIterator.hasNext())
{
sourceAnnotation = sourceAnnotationIterator.next();
-
+
+ Iterator<Annotation> targetAnnotationIterator = targetAnnotations.iterator();
while (targetAnnotationIterator.hasNext())
{
targetAnnotation = targetAnnotationIterator.next();