Attachment 151329 Details for Bug 294211 – possible fix

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

[patch] possible fix

294211.patch (text/plain), 1.56 KB, created by Thomas Watson

on 2009-11-04 11:20:55 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2009-11-04 11:20:55 EST

Size: 1.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.osgi
>Index: defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java,v
>retrieving revision 1.5
>diff -u -r1.5 DevClassLoadingHook.java
>--- defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java	24 Apr 2009 20:30:52 -0000	1.5
>+++ defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java	4 Nov 2009 16:23:36 -0000
>@@ -48,10 +48,12 @@
> 				// if in dev mode, try using the cp as an absolute path
> 				// we assume absolute entries come from fragments.  Find the source
> 				BaseData fragData = findFragmentSource(sourcedata, devClassPath[i], hostmanager);
>-				ClasspathEntry entry = hostmanager.getExternalClassPath(devClassPath[i], fragData, sourcedomain);
>-				if (entry != null) {
>-					cpEntries.add(entry);
>-					result = true;
>+				if (fragData != null) {
>+					ClasspathEntry entry = hostmanager.getExternalClassPath(devClassPath[i], fragData, sourcedomain);
>+					if (entry != null) {
>+						cpEntries.add(entry);
>+						result = true;
>+					}
> 				}
> 			}
> 		}
>@@ -75,7 +77,7 @@
> 			if (fragFile != null && file.getPath().startsWith(fragFile.getPath()))
> 				return fragCP[i].getBundleData();
> 		}
>-		return hostData;
>+		return null;
> 	}
> 
> 	public String findLibrary(BaseData data, String libName) {

Actions: View | Diff

Attachments on bug 294211: 151313 | 151314 | 151329 | 151515 | 151617 | 151621