Bug 415837 - Out of order locks for module state change lock can happen for unresolve and resolve

 - Need prevent recursive start from resolve operation.

1 files changed, 13 insertions, 0 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
index d6ab255c3..9aa2d8674 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
@@ -157,6 +157,12 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
 	final ReentrantLock stateChangeLock = new ReentrantLock();
 	private final EnumSet<ModuleEvent> stateTransitionEvents = EnumSet.noneOf(ModuleEvent.class);
 	private final EnumSet<Settings> settings;
+	private final ThreadLocal<Boolean> inStartResolve = new ThreadLocal<Boolean>() {
+		@Override
+		protected Boolean initialValue() {
+			return Boolean.FALSE;
+		}
+	};
 	private volatile State state = State.INSTALLED;
 	private volatile int startlevel;
 	private volatile long lastModified;
@@ -395,8 +401,10 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
 				lockedStarted = false;
 				ModuleResolutionReport report;
 				try {
+					inStartResolve.set(Boolean.TRUE);
 					report = getRevisions().getContainer().resolve(Arrays.asList(this), true);
 				} finally {
+					inStartResolve.set(Boolean.FALSE);
 					lockStateChange(ModuleEvent.STARTED);
 					lockedStarted = true;
 				}
@@ -424,6 +432,7 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
 				event = ModuleEvent.STOPPED;
 			}
 		} finally {
+			inStartResolve.set(Boolean.FALSE);
 			if (lockedStarted) {
 				unlockStateChange(ModuleEvent.STARTED);
 			}
@@ -665,4 +674,8 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
 		ModuleRevision current = getCurrentRevision();
 		return current == null ? false : current.hasLazyActivatePolicy();
 	}
+
+	boolean inStartResolve() {
+		return inStartResolve.get().booleanValue();
+	}
 }