From 269e7c7b676826e768ce618802adc0a21ea43fd0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 9 Aug 2007 13:26:12 +0000
Subject: [PATCH] [198650] Fix assertion when restoring workbench state

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

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 254b3b72d8e..9043ec812dc 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
@@ -39,6 +39,7 @@
  * David McKnight   (IBM)        - [196662] Avoid main thread query to check exists when remote refreshing
  * Kevin Doyle  (IBM)            - [198576] Renaming a folder directly under a Filter doesn't update children
  * Kevin Doyle (IBM) 			 - [196582] Deprecated getRemoteObjectIdentifier
+ * Martin Oberhuber (Wind River) - [198650] Fix assertion when restoring workbench state
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -2989,7 +2990,7 @@ public class SystemView extends SafeTreeViewer
 		List matches = new Vector();
 		// STEP 2: find all references to the object
 		findAllRemoteItemReferences(oldElementName, remoteObject, subsystem, matches);
-		if (remoteObject instanceof String) {
+		if (matches.size()>0 && remoteObject instanceof String) {
 			//TODO one String may reference multiple different context objects, so we should really iterate over all matches here
 			//See javadoc of findAllRemoteItemReferences
 			remoteObject = getFirstRemoteObject(matches);