Revert "Gjoranv/allow duplicate bundles"

2 files changed, 1 insertions, 18 deletions

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 0d5b4c85264..08a70db7562 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()) {
+        if (bundleLocation != null && bundleLocation.isEmpty() == false) {
             try {
                 URL url = new URL(bundleLocation);
                 bundleLocations.add(url);
@@ -106,14 +106,6 @@ public final class ClassLoaderOsgiFramework implements OsgiFramework {
     }
 
     @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 cfd5f753c4f..04c3396c95c 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,7 +24,6 @@ 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;
@@ -143,14 +142,6 @@ public class StandaloneContainerActivator implements BundleActivator {
         }
 
         @Override
-        public List<Bundle> getBundles(Bundle requestingBundle) {
-            return Collections.emptyList();
-        }
-
-        @Override
-        public void allowDuplicateBundles(Collection<Bundle> bundles) { }
-
-        @Override
         public void start() {
         }