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/04/26 17:32:36 UTC

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

Author: arobinson74
Date: Mon Apr 26 15:32:36 2010
New Revision: 938094

URL: http://svn.apache.org/viewvc?rev=938094&view=rev
Log:
Applying patch for TRINIDAD-1796

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

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java?rev=938094&r1=938093&r2=938094&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java Mon Apr 26 15:32:36 2010
@@ -176,6 +176,15 @@ public class ChildPropertyTreeModel exte
     {
       Object pathKey = path.get(i);
       _setRowKey(pathKey);
+      if (!isRowAvailable())
+      {
+        // setRowKey should fail for invalid row key in the path.
+        // Also isRowAvailable should return false
+        _path.clear();
+        _path.add(root);
+        setRowIndex(-1);
+        return;        
+      }
       enterContainer();
     }