diff options
author | Frode Lundgren <frodelu@yahooinc.com> | 2023-01-10 18:32:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-10 18:32:05 +0100 |
commit | ad97555d3a0cef8ae0bcf63b419c8340105caf1c (patch) | |
tree | 8c2dd7ca8c4458758a40ec48c1304778f78fec65 | |
parent | 1402b8c5ac7cf608bcbdabb46873d6a3308ab69d (diff) | |
parent | 853cab2b5c43a9decf46eee6354f38894a905360 (diff) |
Merge pull request #25488 from vespa-engine/revert-25475-skip-fallback-class-resolution-for-explicit-bundle_2
Revert "Skip fallback class resolution for explicit bundle 2 [run-systemtest]"
-rw-r--r-- | container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index 9d023e2a7ca..4acdc3d544b 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -62,11 +62,6 @@ public class OsgiImpl implements Osgi { if (bundle != null) { return resolveFromBundle(spec, bundle); } else { - if (jdiscOsgi.isFelixFramework() && ! spec.bundle.equals(spec.classId)) { - // Bundle was explicitly specified, but not found. - throw new IllegalArgumentException("Could not find bundle " + spec.bundle + " to create a component with class '" - + spec.classId.getName() + ". " + bundleResolutionErrorMessage(spec.bundle)); - } return resolveFromThisBundleOrSystemBundle(spec); } } |