svn commit: r675322 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java

[knopp]

Author: knopp
Date: Wed Jul  9 12:39:40 2008
New Revision: 675322

URL: http://svn.apache.org/viewvc?rev=675322&view=rev
Log:
possible npe fix

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=675322&r1=675321&r2=675322&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
 Wed Jul  9 12:39:40 2008
@@ -771,26 +771,30 @@
                {
                        TreeItem parentItem = nodeToItemMap.get(parent);
 
-                       if (parentItem.getChildren().isEmpty())
+                       if (parentItem != null)
                        {
-                               invalidateNode(parent, true);
-                       }
-
-                       for (int i = 0; i < e.getChildren().length; ++i)
-                       {
-                               Object node = e.getChildren()[i];
-                               int index = e.getChildIndices()[i];
-                               TreeItem item = newTreeItem(parentItem, node, 
parentItem.getLevel() + 1);
-                               itemContainer.add(item);
-                               parentItem.getChildren().add(index, item);
-
-                               markTheLastButOneChildDirty(parentItem, item);
-
-                               if (!dirtyItems.contains(item))
-                                       dirtyItems.add(item);
-
-                               if (!dirtyItemsCreateDOM.contains(item))
-                                       dirtyItemsCreateDOM.add(item);
+                       
+                               if (parentItem.getChildren().isEmpty())
+                               {
+                                       invalidateNode(parent, true);
+                               }
+       
+                               for (int i = 0; i < e.getChildren().length; ++i)
+                               {
+                                       Object node = e.getChildren()[i];
+                                       int index = e.getChildIndices()[i];
+                                       TreeItem item = newTreeItem(parentItem, 
node, parentItem.getLevel() + 1);
+                                       itemContainer.add(item);
+                                       parentItem.getChildren().add(index, 
item);
+       
+                                       markTheLastButOneChildDirty(parentItem, 
item);
+       
+                                       if (!dirtyItems.contains(item))
+                                               dirtyItems.add(item);
+       
+                                       if (!dirtyItemsCreateDOM.contains(item))
+                                               dirtyItemsCreateDOM.add(item);
+                               }
                        }
                }
        }