Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2020-07-02 13:22:14 +0000
committerThomas Watson2020-07-02 13:22:38 +0000
commit17fdf326eff3180a0958de486394f8e079b5d164 (patch)
tree9761a3a419614c4abb4f2f7c1f6f9c89f97ffc84
parentd5a30b98485696d2234fef700bc2eaacdaacd599 (diff)
downloadrt.equinox.framework-I20200702-2150.tar.gz
rt.equinox.framework-I20200702-2150.tar.xz
rt.equinox.framework-I20200702-2150.zip
Connect bundles have no source base file. This results in null returned by getBaseFile. Other calls to this method were already fixed. Adding the null check to DevClassLoadingHook to be safe. Change-Id: I81e8bdf6c6e00ac95c87f13e560d00364c3a7ae2 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
index d7ec50bc4..ca9a3e64b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
@@ -79,7 +79,7 @@ public class DevClassLoadingHook extends ClassLoaderHook implements KeyedElement
if (!fromFragment && devCP.indexOf("..") >= 0) { //$NON-NLS-1$
// if in dev mode, try using cp as a relative path from the base bundle file
File base = sourceGeneration.getBundleFile().getBaseFile();
- if (base.isDirectory()) {
+ if (base != null && base.isDirectory()) {
// this is only supported for directory bundles
ClasspathEntry entry = hostmanager.getExternalClassPath(new File(base, devCP).getAbsolutePath(), sourceGeneration);
if (entry != null) {

Back to the top