From af402a4857ec442e86fec0b366bbcc03c83de482 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 15 Feb 2008 16:58:13 +0000
Subject: [PATCH] Avoid null items during moveItem()

---
 .../org/eclipse/rse/internal/ui/view/SystemView.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index 20dd2f279d1..63893540f2c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -1500,6 +1500,11 @@ public class SystemView extends SafeTreeViewer
 	 * Move one tree item to a new location
 	 */
 	protected void moveTreeItem(Widget parentItem, Item item, Object src, int newPosition) {
+		if (item==null) {
+			//Null items during RSECombinedTestSuite - put debugBreak here to investigate
+			assert item!=null;
+			return;
+		}
 		if (getExpanded(item)) {
 			setExpanded(item, false);
 			refresh(src); // flush items from memory  	  
@@ -1667,6 +1672,7 @@ public class SystemView extends SafeTreeViewer
 
 		protected ISystemResourceChangeEvent _event;
 		protected SystemView _originatingViewer;
+		//public Exception _originatingThread; //for debugging
 
 		public ResourceChangedJob(ISystemResourceChangeEvent event, SystemView originatingViewer) {
 			super("Resource Changed..."); //$NON-NLS-1$
@@ -1674,6 +1680,10 @@ public class SystemView extends SafeTreeViewer
 			//See also originatedHere, below
 			_originatingViewer = originatingViewer;
 			_event = event;
+			//_originatingThread = new Exception();
+			//_originatingThread.fillInStackTrace();
+			////_originatingThread.printStackTrace();
+			////System.out.println("<<<<<<<<<<<<<");
 		}
 
 		public IStatus runInUIThread(IProgressMonitor monitor) {