Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorustieber2011-05-07 03:10:31 -0400
committerustieber2011-05-07 03:10:31 -0400
commitd5d0068ca77c5504f3fff751525695a3aafd6a3e (patch)
treec29dc25a2b95638ebb8224338a922629e55d4a5a
parent37fcd6cb789bf7e9d3da54456e3bffc51332dfd7 (diff)
downloadorg.eclipse.tcf-d5d0068ca77c5504f3fff751525695a3aafd6a3e.tar.gz
org.eclipse.tcf-d5d0068ca77c5504f3fff751525695a3aafd6a3e.tar.xz
org.eclipse.tcf-d5d0068ca77c5504f3fff751525695a3aafd6a3e.zip
Target Explorer: Fix: hasChildren returns false for a second peer node if user expands one peer node, both with file system service available
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
index 7a3cecfb8..710899eba 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
@@ -464,8 +464,12 @@ public class FSTreeContentProvider implements ITreeContentProvider {
});
}
+ // Get the root node for this peer model object.
+ // If null, true is returned as it means that the file system
+ // model hasn't been created yet and have to treat is as children
+ // not queried yet.
FSTreeNode root = peerId[0] != null ? fModel.getRoot(peerId[0]): null;
- if (root != null) hasChildren = hasChildren(root);
+ hasChildren = root != null ? hasChildren(root) : true;
}
return hasChildren;

Back to the top