Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Decouple config and netconf subsystems.
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
mapping
/
RefreshingSCPModuleInfoRegistry.java
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 d4add505038eb3cdced6f55c77785ed478c663f3..b62e60382c09210c6e24f6fc7be7db95b1c73944 100644
(file)
--- 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
@@
-12,6
+12,7
@@
import java.util.Hashtable;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy;
import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy;
import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry;
+import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
import org.osgi.framework.BundleContext;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
import org.osgi.framework.BundleContext;
@@
-40,7
+41,10
@@
public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
private void updateService() {
bindingContextProvider.update(classLoadingStrat, schemaContextProvider);
private void updateService() {
bindingContextProvider.update(classLoadingStrat, schemaContextProvider);
- osgiReg.setProperties(null); // send modifiedService event
+ osgiReg.setProperties(new Hashtable<String, Object>() {{
+ put(BindingRuntimeContext.class.getName(), bindingContextProvider.getBindingContext());
+ }
+ }); // send modifiedService event
}
@Override
}
@Override
@@
-56,7
+60,6
@@
public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
osgiReg.unregister();
}
osgiReg.unregister();
}
-
private class ObjectRegistrationWrapper implements ObjectRegistration<YangModuleInfo> {
private final ObjectRegistration<YangModuleInfo> inner;
private class ObjectRegistrationWrapper implements ObjectRegistration<YangModuleInfo> {
private final ObjectRegistration<YangModuleInfo> inner;
@@
-75,7
+78,6
@@
public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
updateService();// send modify event when a bundle disappears
}
updateService();// send modify event when a bundle disappears
}
-
@Override
public String toString() {
return inner.toString();
@Override
public String toString() {
return inner.toString();