Bug 496543 - TreeUtil should not show a sub-level marker if null is returned from the factory

1 files changed, 10 insertions, 8 deletions

diff --git a/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/TreeUtil.java b/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/TreeUtil.java
index d14f6cd0a..1f3b6f3e5 100755
--- a/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/TreeUtil.java
+++ b/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/TreeUtil.java
@@ -70,15 +70,17 @@ public class TreeUtil {
 			setValue(element);
 			this.factory = factory;
 			this.list = factory.createObservable(element);
-			getChildren().add(new TreeItem<>());
-
-			expandedProperty().addListener((o) -> {
-				if( isExpanded() ) {
-					if( ! this.hasLoadedChildren ) {
-						loadChildren();
+			if( this.list != null ) {
+				getChildren().add(new TreeItem<>());
+
+				expandedProperty().addListener((o) -> {
+					if( isExpanded() ) {
+						if( ! this.hasLoadedChildren ) {
+							loadChildren();
+						}
 					}
-				}
-			});
+				});
+			}
 		}
 
 //		@Override