From cd6d62b76aa3de2047457957676905cb59e26315 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 4 Nov 2015 15:30:43 +0100 Subject: [PATCH] Do not subclass Hashtable Rather than subclassing, instantiate a Hashtable and fill it. Change-Id: Icfd4e812759874a702a2506e9090cd20535bdc50 Signed-off-by: Robert Varga --- .../mapping/RefreshingSCPModuleInfoRegistry.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java index 5321dded8f..8001169771 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.config.manager.impl.osgi.mapping; +import java.util.Dictionary; import java.util.Hashtable; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; @@ -54,10 +55,11 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto if(osgiReg != null) { try { bindingContextProvider.update(classLoadingStrat, schemaContextProvider); - osgiReg.setProperties(new Hashtable() {{ - put(BindingRuntimeContext.class.getName(), bindingContextProvider.getBindingContext()); - put(SchemaSourceProvider.class.getName(), sourceProvider); - }}); // send modifiedService event + + final Dictionary props = new Hashtable<>(); + props.put(BindingRuntimeContext.class.getName(), bindingContextProvider.getBindingContext()); + props.put(SchemaSourceProvider.class.getName(), sourceProvider); + osgiReg.setProperties(props); // send modifiedService event } catch (RuntimeException e) { // The ModuleInfoBackedContext throws a RuntimeException if it can't create the schema context. LOG.warn("Error updating the BindingContextProvider", e); @@ -66,7 +68,7 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto } @Override - public ObjectRegistration registerModuleInfo(YangModuleInfo yangModuleInfo) { + public ObjectRegistration registerModuleInfo(final YangModuleInfo yangModuleInfo) { ObjectRegistration yangModuleInfoObjectRegistration = moduleInfoRegistry.registerModuleInfo(yangModuleInfo); ObjectRegistrationWrapper wrapper = new ObjectRegistrationWrapper(yangModuleInfoObjectRegistration); return wrapper; @@ -84,7 +86,7 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto private class ObjectRegistrationWrapper implements ObjectRegistration { private final ObjectRegistration inner; - private ObjectRegistrationWrapper(ObjectRegistration inner) { + private ObjectRegistrationWrapper(final ObjectRegistration inner) { this.inner = inner; } -- 2.36.6