Attachment 180213 Details for Bug 326502 – dev patch

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

[patch] dev patch

devPatch.txt (text/plain), 1.69 KB, created by Thomas Watson

on 2010-10-04 17:30:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2010-10-04 17:30:34 EDT

Size: 1.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.osgi
>Index: resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java,v
>retrieving revision 1.91
>diff -u -r1.91 StateImpl.java
>--- resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java	23 Sep 2010 19:02:45 -0000	1.91
>+++ resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java	4 Oct 2010 21:25:26 -0000
>@@ -58,6 +58,7 @@
> 	private final Set<String> platformPropertyKeys = new HashSet<String>(PROPS.length);
> 	private ResolverHookFactory hookFactory;
> 	private ResolverHook hook;
>+	private boolean developmentMode = false;
> 
> 	private static long cumulativeTime;
> 
>@@ -454,6 +455,13 @@
> 				} else {
> 					if (resolved && reResolve == null)
> 						return new StateDeltaImpl(this);
>+					if (developmentMode) {
>+						// in dev mode we need to aggressively flush removal pendings 
>+						if (removalPendings.size() > 0) {
>+							BundleDescription[] removed = internalGetRemovalPending();
>+							reResolve = mergeBundles(reResolve, removed);
>+						}
>+					}
> 					if (reResolve == null)
> 						reResolve = internalGetRemovalPending();
> 					if (triggers == null) {
>@@ -794,6 +802,7 @@
> 			resetSystemExports();
> 		if (performResetSystemCapabilities)
> 			resetSystemCapabilities();
>+		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));
> 		return result;
> 	}
>

Actions: View | Diff

Attachments on bug 326502: 180213