diff --git a/csl.api/src/org/netbeans/modules/csl/navigation/ElementNode.java b/csl.api/src/org/netbeans/modules/csl/navigation/ElementNode.java --- a/csl.api/src/org/netbeans/modules/csl/navigation/ElementNode.java +++ b/csl.api/src/org/netbeans/modules/csl/navigation/ElementNode.java @@ -545,7 +545,7 @@ synchronized (this) { this.parentItem = description; - if (processing == 0) { + if (!initialized && processing == 0) { return null; } items = snapshot(); diff --git a/csl.api/src/org/netbeans/modules/csl/navigation/TreeUpdater.java b/csl.api/src/org/netbeans/modules/csl/navigation/TreeUpdater.java --- a/csl.api/src/org/netbeans/modules/csl/navigation/TreeUpdater.java +++ b/csl.api/src/org/netbeans/modules/csl/navigation/TreeUpdater.java @@ -46,6 +46,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -77,13 +78,13 @@ */ private boolean waiting; - private List nodesToExpand; + private final List nodesToExpand = new LinkedList(); - private List nodesToExpandRec; + private final List nodesToExpandRec = new LinkedList(); private List childrenToUpdate; - private List newChildren; + private List newChildren = new ArrayList(); public TreeUpdater(ClassMemberPanelUI ui) { this.ui = ui;