diff options
| author | Thomas Watson | 2005-05-12 15:21:18 +0000 |
|---|---|---|
| committer | Thomas Watson | 2005-05-12 15:21:18 +0000 |
| commit | c0be9ebc398c4b1a593002f7f512c80d35862d40 (patch) | |
| tree | 776a41df7a497f75f397f86cec33889174129f38 | |
| parent | 2115cc1aeeb2788612bd089c5fe8e63098b1f0f3 (diff) | |
| download | rt.equinox.framework-20050512-1200.tar.gz rt.equinox.framework-20050512-1200.tar.xz rt.equinox.framework-20050512-1200.zip | |
Bug 94970 plugins with external jars should use external:v20050512-1200
| -rw-r--r-- | bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseClassLoader.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseClassLoader.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseClassLoader.java index 6b37dab39..b2fce3bc6 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseClassLoader.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseClassLoader.java @@ -37,6 +37,7 @@ public class EclipseClassLoader extends DefaultClassLoader { private static boolean DEFINE_PACKAGES; private static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$ private static final char VARIABLE_DELIM_CHAR = '$'; + private static final String EXTERNAL_LIB_PREFIX = "external:"; //$NON-NLS-1$ static { try { Class.forName("java.lang.Package"); //$NON-NLS-1$ @@ -243,7 +244,8 @@ public class EclipseClassLoader extends DefaultClassLoader { findInternalClassPath(var, result, entry, bundledata, domain); return; } - if (entry.length() > 0 && entry.charAt(0) == VARIABLE_DELIM_CHAR) { + if (entry.startsWith(EXTERNAL_LIB_PREFIX)) { + entry = entry.substring(EXTERNAL_LIB_PREFIX.length()); // find external library using system property substitution ClasspathEntry cpEntry = getExternalClassPath(substituteVars(entry), bundledata, domain); if (cpEntry != null) |