Bug 342613 [DS] ClassCircularityError when activating servicesv20111122-1358

1 files changed, 16 insertions, 3 deletions

diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/InstanceProcess.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/InstanceProcess.java
index 16c93b67a..09c9e90d3 100644
--- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/InstanceProcess.java
+++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/InstanceProcess.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.ds;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import org.apache.felix.scr.Component;
 import org.eclipse.equinox.internal.ds.impl.ComponentFactoryImpl;
@@ -587,12 +588,18 @@ public class InstanceProcess {
 			try {
 				componentInstance = scp.build(usingBundle, instance, security);
 			} catch (ClassCircularityError e) {
-				Vector component = new Vector(1);
-				component.add(scp.serviceComponent);
-				resolver.mgr.enqueueWork(resolver.mgr, resolver.mgr.ENABLE_COMPONENTS, component, false);
+				processSCPInClassCircularityError(scp);
 				throw new ComponentException(NLS.bind(Messages.ERROR_BUILDING_COMPONENT_INSTANCE, scp.serviceComponent), e);
 			} catch (ComponentException e) {
 				Activator.log(null, LogService.LOG_ERROR, e.getMessage(), e.getCause());
+				Throwable t = e.getCause();
+				if (t instanceof InvocationTargetException) {
+					Throwable cause = t.getCause();
+					if (cause instanceof ClassCircularityError) {
+						processSCPInClassCircularityError(scp);
+					}
+				}
+
 				throw e;
 			} catch (Throwable t) {
 				Activator.log(null, LogService.LOG_ERROR, NLS.bind(Messages.ERROR_BUILDING_COMPONENT_INSTANCE, scp.serviceComponent), t);
@@ -628,6 +635,12 @@ public class InstanceProcess {
 		}
 	}
 
+	private void processSCPInClassCircularityError(ServiceComponentProp currentScp) {
+		Vector component = new Vector(1);
+		component.add(currentScp.serviceComponent);
+		resolver.mgr.enqueueWork(resolver.mgr, resolver.mgr.ENABLE_COMPONENTS, component, false);
+	}
+
 	public void modifyComponent(ServiceComponentProp scp, Dictionary newProps) throws ComponentException {
 		if (Activator.DEBUG) {
 			Activator.log.debug("Modifying component " + scp.name, null); //$NON-NLS-1$