From bc6a937f0b7cb7e3068f76029c65574383356f8f Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 11 Aug 2006 18:54:37 +0000
Subject: [PATCH] don't assume service subsystem configuration

---
 .../eclipse/rse/internal/model/SystemRegistry.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
index 72cc940b7dc..ea39690d35f 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
@@ -630,11 +630,15 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
 								// remove the other one
 								for (int i = 0; i < v.size(); i++)
 								{
-									IServiceSubSystemConfiguration addedConfig = (IServiceSubSystemConfiguration)v.get(i);
-									if (addedConfig.getServiceType() == serviceType)
-									{
-										v.remove(addedConfig);
+									if (v.get(i) instanceof IServiceSubSystemConfiguration)
+									{		
+										IServiceSubSystemConfiguration addedConfig = (IServiceSubSystemConfiguration)v.get(i);
+										if (addedConfig.getServiceType() == serviceType)
+										{
+											v.remove(addedConfig);
+										}
 									}
+
 								}
 								
 								v.addElement(ssFactory);