From 3eb3d2d181fd81a1b723f90ca98d56e8bc7b3ba4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Feb 2014 14:06:39 +0100 Subject: [PATCH] Fix unintentional breakage Yangtools commit 6e7a42bd344f5928343ad67328bc8a8a734bea2e introduced a new method which broke the controller-side proxy. Fix it up by simply forwarning it through the delegate. Change-Id: I4582acb3a6987d9d87d422a86283984a38cd31ba Signed-off-by: Robert Varga --- .../md/sal/binding/impl/RuntimeMappingModule.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java index a2b3d17b7c..583591615c 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java @@ -29,6 +29,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; /** @@ -64,7 +65,7 @@ public final class RuntimeMappingModule extends @Override public java.lang.AutoCloseable createInstance() { - + RuntimeGeneratedMappingServiceProxy potential = tryToReuseGlobalInstance(); if(potential != null) { return potential; @@ -101,7 +102,7 @@ public final class RuntimeMappingModule extends BindingIndependentMappingService, // Delegator, // AutoCloseable { - + private BindingIndependentMappingService delegate; private ServiceReference reference; private BundleContext bundleContext; @@ -150,7 +151,12 @@ public final class RuntimeMappingModule extends public DataContainer dataObjectFromDataDom(Class inputClass, CompositeNode domInput) { return delegate.dataObjectFromDataDom(inputClass, domInput); } - + + @Override + public Optional> getRpcServiceClassFor(String namespace, String revision) { + return delegate.getRpcServiceClassFor(namespace, revision); + } + @Override public void close() throws Exception { if(delegate != null) { -- 2.36.6