Make sure to catch NoClassDefFoundError when trying to query the framework classloader for whether a class is available or not. Previously, it was possible that this query was leaked to bundles because of the error propagate all the way to the bundle that instigated the classload.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@644939 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
index cba96f6..7aa7059 100755
--- a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
+++ b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
@@ -599,7 +599,14 @@
}
if (delegate)
{
- return this.getClass().getClassLoader().loadClass(name);
+ try
+ {
+ return this.getClass().getClassLoader().loadClass(name);
+ }
+ catch (NoClassDefFoundError ex)
+ {
+ // Ignore, will return null
+ }
}
break;
}
@@ -3188,6 +3195,10 @@
getClass().getClassLoader().loadClass(name);
classpath = true;
}
+ catch (NoClassDefFoundError err)
+ {
+ // Ignore
+ }
catch (Exception ex)
{
// Ignore