Bug 385359 - SWTBotTreeItem.getItems() should guard against disposed tree items

1 files changed, 6 insertions, 4 deletions

diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
index bc5df7c..106273d 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2008, 2010 Ketan Padegaonkar and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -678,11 +678,13 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> {
 		return syncExec(new ArrayResult<SWTBotTreeItem>() {
 			public SWTBotTreeItem[] run() {
 				TreeItem[] items = widget.getItems();
-				SWTBotTreeItem[] children = new SWTBotTreeItem[items.length];
+				List<SWTBotTreeItem> children = new ArrayList<SWTBotTreeItem>(); 
 				for (int i = 0; i < items.length; i++) {
-					children[i] = new SWTBotTreeItem(items[i]);
+					if (!items[i].isDisposed()) {
+						children.add(new SWTBotTreeItem(items[i]));
+					}
 				}
-				return children;
+				return children.toArray(new SWTBotTreeItem[children.size()]);
 			}
 		});
 	}