diff options
author | gjoranv <gjoranv@gmail.com> | 2019-11-04 15:55:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-04 15:55:23 +0100 |
commit | 2ef1e922a1d845b3cd79e9fb329925e7e9896919 (patch) | |
tree | 429207fa364a2f6ecbc523b78c3bc4d7f967cf39 /jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java | |
parent | 8b0f9567b6f4baed6565174b68a356b4b8bdcd51 (diff) |
Revert "Gjoranv/allow duplicate bundles"
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java index c14e513fb98..19a1707e97c 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java @@ -117,9 +117,6 @@ public class FelixFramework implements OsgiFramework { return sb.toString(); } - /** - * NOTE: This method is no longer used by the Jdisc container framework, but kept for completeness. - */ @Override public void refreshPackages() { FrameworkWiring wiring = felix.adapt(FrameworkWiring.class); @@ -156,13 +153,8 @@ public class FelixFramework implements OsgiFramework { return Arrays.asList(felix.getBundleContext().getBundles()); } - @Override public List<Bundle> getBundles(Bundle requestingBundle) { - log.fine(() -> "All bundles: " + bundles()); - log.fine(() -> "Getting visible bundles for bundle " + requestingBundle); - List<Bundle> visibleBundles = Arrays.asList(requestingBundle.getBundleContext().getBundles()); - log.fine(() -> "Visible bundles: " + visibleBundles); - return visibleBundles; + return Arrays.asList(requestingBundle.getBundleContext().getBundles()); } public void allowDuplicateBundles(Collection<Bundle> bundles) { |