From d75825d503b8566e66d45b0ef726a1d5834970d7 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 5 Nov 2019 10:53:44 +0100
Subject: Reapply "Gjoranv/allow duplicate bundles"

This reverts commit 2ef1e922a1d845b3cd79e9fb329925e7e9896919.
---
 .../application/container/impl/ClassLoaderOsgiFramework.java   | 10 +++++++++-
 .../container/standalone/StandaloneContainerActivator.java     |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'standalone-container/src')

diff --git a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java
index 08a70db7562..0d5b4c85264 100644
--- a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java
+++ b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java
@@ -63,7 +63,7 @@ public final class ClassLoaderOsgiFramework implements OsgiFramework {
 
     @Override
     public List<Bundle> installBundle(String bundleLocation) {
-        if (bundleLocation != null && bundleLocation.isEmpty() == false) {
+        if (bundleLocation != null && ! bundleLocation.isEmpty()) {
             try {
                 URL url = new URL(bundleLocation);
                 bundleLocations.add(url);
@@ -105,6 +105,14 @@ public final class ClassLoaderOsgiFramework implements OsgiFramework {
         return bundleList;
     }
 
+    @Override
+    public List<Bundle> getBundles(Bundle requestingBundle) {
+        return bundleList;
+    }
+
+    @Override
+    public void allowDuplicateBundles(Collection<Bundle> bundles) { }
+
     @Override
     public void start() {
     }
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java
index 04c3396c95c..cfd5f753c4f 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java
@@ -24,6 +24,7 @@ import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
@@ -141,6 +142,14 @@ public class StandaloneContainerActivator implements BundleActivator {
             return Collections.emptyList();
         }
 
+        @Override
+        public List<Bundle> getBundles(Bundle requestingBundle) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public void allowDuplicateBundles(Collection<Bundle> bundles) { }
+
         @Override
         public void start() {
         }
-- 
cgit v1.2.3