Attachment #180213 for bug #326502

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 326502
Collapse All | Expand All

Lines 58-63 Link Here

(-)resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java (+9 lines)
58	private final Set<String> platformPropertyKeys = new HashSet<String>(PROPS.length);	58	private final Set<String> platformPropertyKeys = new HashSet<String>(PROPS.length);
59	private ResolverHookFactory hookFactory;	59	private ResolverHookFactory hookFactory;
60	private ResolverHook hook;	60	private ResolverHook hook;
		61	private boolean developmentMode = false;
61		62
62	private static long cumulativeTime;	63	private static long cumulativeTime;
63		64
Lines 454-459 Link Here
454	} else {	455	} else {
455	if (resolved && reResolve == null)	456	if (resolved && reResolve == null)
456	return new StateDeltaImpl(this);	457	return new StateDeltaImpl(this);
		458	if (developmentMode) {
		459	// in dev mode we need to aggressively flush removal pendings
		460	if (removalPendings.size() > 0) {
		461	BundleDescription[] removed = internalGetRemovalPending();
		462	reResolve = mergeBundles(reResolve, removed);
		463	}
		464	}
457	if (reResolve == null)	465	if (reResolve == null)
458	reResolve = internalGetRemovalPending();	466	reResolve = internalGetRemovalPending();
459	if (triggers == null) {	467	if (triggers == null) {
Lines 794-799 Link Here
794	resetSystemExports();	802	resetSystemExports();
795	if (performResetSystemCapabilities)	803	if (performResetSystemCapabilities)
796	resetSystemCapabilities();	804	resetSystemCapabilities();
		805	developmentMode = this.platformProperties.length == 0 ? false : org.eclipse.osgi.framework.internal.core.Constants.DEVELOPMENT_MODE.equals(this.platformProperties[0].get(org.eclipse.osgi.framework.internal.core.Constants.OSGI_RESOLVER_MODE));
797	return result;	806	return result;
798	}	807	}
799		808

Return to bug 326502