Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 488: Removed requirement for DOM providers to supply BundleContext."
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
md
/
sal
/
binding
/
impl
/
RuntimeMappingModule.java
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 0762739c636eaff397371f7bd6b01ef223300099..0f0ce0dc9dd24fb41bc54bde70c196ba2d4d511e 100644
(file)
--- 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
@@
-26,6
+26,8
@@
import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@
-36,6
+38,8
@@
import com.google.common.base.Preconditions;
public final class RuntimeMappingModule extends
org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModule {
public final class RuntimeMappingModule extends
org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModule {
+ private static final Logger LOG = LoggerFactory.getLogger(RuntimeMappingModule.class);
+
private BundleContext bundleContext;
public RuntimeMappingModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
private BundleContext bundleContext;
public RuntimeMappingModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
@@
-68,9
+72,8
@@
public final class RuntimeMappingModule extends
if(potential != null) {
return potential;
}
if(potential != null) {
return potential;
}
- RuntimeGeneratedMappingServiceImpl service = new RuntimeGeneratedMappingServiceImpl();
- service.setPool(SingletonHolder.CLASS_POOL);
- service.init();
+
+ final RuntimeGeneratedMappingServiceImpl service = new RuntimeGeneratedMappingServiceImpl(SingletonHolder.CLASS_POOL);
bundleContext.registerService(SchemaServiceListener.class, service, new Hashtable<String,String>());
return service;
}
bundleContext.registerService(SchemaServiceListener.class, service, new Hashtable<String,String>());
return service;
}
@@
-154,20
+157,27
@@
public final class RuntimeMappingModule extends
}
@Override
}
@Override
- public
DataContainer dataObjectFromDataDom(Class<? extends DataContainer> inputClass, CompositeNode domInput
) {
- return delegate.
dataObjectFromDataDom(inputClass, domInput
);
+ public
Optional<Class<? extends RpcService>> getRpcServiceClassFor(String namespace, String revision
) {
+ return delegate.
getRpcServiceClassFor(namespace,revision
);
}
@Override
}
@Override
- public
Optional<Class<? extends RpcService>> getRpcServiceClassFor(String namespace, String revision
) {
- return delegate.
getRpcServiceClassFor(namespace, revision
);
+ public
DataContainer dataObjectFromDataDom(Class<? extends DataContainer> inputClass, CompositeNode domInput
) {
+ return delegate.
dataObjectFromDataDom(inputClass, domInput
);
}
@Override
}
@Override
- public void close()
throws Exception
{
+ public void close() {
if(delegate != null) {
delegate = null;
if(delegate != null) {
delegate = null;
- bundleContext.ungetService(reference);
+
+ try {
+ bundleContext.ungetService(reference);
+ } catch (IllegalStateException e) {
+ // Indicates the BundleContext is no longer valid which can happen normally on shutdown.
+ LOG.debug( "Error unregistering service", e );
+ }
+
bundleContext= null;
reference = null;
}
bundleContext= null;
reference = null;
}