Upgrade felix from 4.4 to 4.6

1 files changed, 10 insertions, 0 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
index 313e26ba8d4..c9cc8dfdfa4 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
@@ -45,6 +45,11 @@ public class RestrictedBundleContext implements BundleContext {
     }
 
     @Override
+    public <S> ServiceRegistration<S> registerService(Class<S> aClass, ServiceFactory<S> serviceFactory, Dictionary<String, ?> dictionary) {
+        return null;
+    }
+
+    @Override
     public ServiceReference<?>[] getServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException {
         if (wrapped == null) {
             return new ServiceReference<?>[0];
@@ -100,6 +105,11 @@ public class RestrictedBundleContext implements BundleContext {
         return wrapped.ungetService(serviceReference);
     }
 
+    @Override
+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> serviceReference) {
+        return null;
+    }
+
 
     //---------------------