fix Ticket #5642

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / TaxonNodeContentProvider.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
index c7a431daf0b0df9e1c6b47149300112a9fe82d91..36e87ee8548e6066c0a1e850871bf4dda435a173 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -38,7 +40,12 @@ public class TaxonNodeContentProvider implements ITreeContentProvider {
 
                if(parentElement instanceof ITaxonTreeNode){
                    ITaxonTreeNode treeNode = (ITaxonTreeNode) HibernateProxyHelper.deproxy(parentElement);
-                       children = treeNode.getChildNodes().toArray();
+                       List<TaxonNode> childrenSet = treeNode.getChildNodes();
+                       while (childrenSet.contains(null)){
+                           childrenSet.remove(null);
+                       }
+                   children = childrenSet.toArray();
+
                }
 
                return children != null ? children : NO_CHILDREN;