143236 - setItemCount(0) leaking TreeItems - 3.2 RC6 FIX

1 files changed, 10 insertions, 9 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
index 2eed51fa86..337964f176 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
@@ -2782,22 +2782,23 @@ void setItemCount (TreeItem parentItem, int count) {
 	OS.SetDataBrowserCallbacks (handle, callbacks);
 	int[] ids = parentItem == null ? childIds : parentItem.childIds;
 	if (count < itemCount) {
-		int index = count;
-		while (index < ids.length) {
+		for (int index = ids.length - 1; index >= count; index--) {
 			int id = ids [index];
 			if (id != 0) {
 				TreeItem item = _getItem (id, false);
-				if (item != null) item.release (false);	
-				if (parentItem == null || parentItem.getExpanded ()) {
-					if (OS.RemoveDataBrowserItems (handle, OS.kDataBrowserNoItem, 1, new int [] {id}, 0) != OS.noErr) {
-						break;
+				if (item != null && !item.isDisposed ()) {
+					item.dispose ();
+				} else {
+					if (parentItem == null || parentItem.getExpanded ()) {
+						if (OS.RemoveDataBrowserItems (handle, OS.kDataBrowserNoItem, 1, new int [] {id}, 0) != OS.noErr) {
+							error (SWT.ERROR_ITEM_NOT_REMOVED);
+							break;
+						}
+						visibleCount--;
 					}
-					visibleCount--;
 				}
 			}
-			index++;
 		}
-		if (index < ids.length) error (SWT.ERROR_ITEM_NOT_REMOVED);
 		//TODO - move shrink to paint event
 		// shrink items array
 		int lastIndex = items.length;