myfaces-commits mailing list archives

Author: gcrawford
Date: Mon Jun  2 20:40:47 2014
New Revision: 1599353

URL: http://svn.apache.org/r1599353
Log:
TRINIDAD-2477
NoSuchElementException in UIXIterator.visitData

thanks to Jing Wu

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java?rev=1599353&r1=1599352&r2=1599353&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
(original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
Mon Jun  2 20:40:47 2014
@@ -349,11 +349,10 @@ public abstract class UIXIteratorTemplat
       }
       else
       {
-        String clientToken = _getClientToken(ourClientIdPrefix,
-                                             subtreeIds.iterator().next());
-
-        if (clientToken != null)
+        if (subtreeIds.iterator().hasNext())
         {
+          String clientToken = _getClientToken(ourClientIdPrefix,
+                                             subtreeIds.iterator().next());
           rowsToVisit = Collections.singleton(clientToken);
         }
         else