[richfaces-svn-commits] JBoss Rich Faces SVN: r9292 - trunk/ui/tree/src/main/java/org/richfaces/component.
Author: nbelaevski
Date: 2008-06-29 18:57:11 -0400 (Sun, 29 Jun 2008)
New Revision: 9292
Modified:
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
Log:
http://jira.jboss.com/jira/browse/RF-3818
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-06-28 16:13:20
UTC (rev 9291)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-06-29 22:57:11
UTC (rev 9292)
@@ -1177,10 +1177,10 @@
Object storedKey = getRowKey();
try {
setRowKey(context, parentRowKey);
- TreeNode parentNode = parentRowKey != null ? getTreeNode() : null;
- if (parentNode == null && getValue() != null && getValue() instanceof
TreeNode) {
- parentNode = (TreeNode) getValue();
- } else {
+ TreeNode parentNode = (parentRowKey != null) ?
+ getTreeNode() : (TreeNode) getExtendedDataModel().getWrappedData();
+
+ if (parentNode == null) {
throw new IllegalArgumentException("Parent node required!");
}