svn commit: r1440728 - /myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java

[gc...@apache.org]

Author: gcrawford
Date: Wed Jan 30 22:51:46 2013
New Revision: 1440728

URL: http://svn.apache.org/viewvc?rev=1440728&view=rev
Log:
TRINIDAD-2356 Regression caused by the check in of issue TRINIDAD-2158 

Thanks to hongbing

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java?rev=1440728&r1=1440727&r2=1440728&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java Wed Jan 30 22:51:46 2013
@@ -836,22 +836,24 @@ public class RowKeySetTreeImpl extends R
           nextNode = _currIterator.next();
           if(_isContained(nextNode.getKey()))
             nextKey = nextNode.getKey();
+          
           // When the currentNode has no child nodes, the 
           // iterator instance is not pushed to iteratorStack.
           if(!nextNode.getValue().isEmpty())
           {
             _iteratorStack.push(_currIterator);
             _currIterator = nextNode.getValue().entrySet().iterator();
-            if(nextNode.getValue().isDefaultContained)
-            {
-              _currPath = nextNode.getKey();
-              TreeModel model = getCollectionModel();
-              Object oldPath = model.getRowKey();
-              model.setRowKey(_currPath);
-              _minDepth = model.getDepth() + 1;
-              model.setRowKey(oldPath);
-              return nextKey;
-            }
+          }
+          
+          if(nextNode.getValue().isDefaultContained)
+          {
+            _currPath = nextNode.getKey();
+            TreeModel model = getCollectionModel();
+            Object oldPath = model.getRowKey();
+            model.setRowKey(_currPath);
+            _minDepth = model.getDepth() + 1;
+            model.setRowKey(oldPath);
+            return nextKey;
           }
         }
       }