홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Naoki Shiota
Committed by Gerrit Code Review
4ce97ffb 1 parent 7dee11ea

Fixed a bug that ComponentConfigManager#preSet never affect OSGi configuration. 

Change-Id: If94c841142ce4dc5e430f7d639f2c2d22039e90a
Inline Side-by-side
Showing 1 changed file with 1 additions and 4 deletions
...@@ -269,10 +269,7 @@ public class ComponentConfigManager implements ComponentConfigService { ...@@ -269,10 +269,7 @@ public class ComponentConfigManager implements ComponentConfigService {
269 // Stores non-existent property so that loadExistingValues() can load in future. 269 // Stores non-existent property so that loadExistingValues() can load in future.
270 private void preSet(String componentName, String name, String value) { 270 private void preSet(String componentName, String name, String value) {
271 try { 271 try {
272 - Configuration config = cfgAdmin.getConfiguration(componentName); 272 + Configuration config = cfgAdmin.getConfiguration(componentName, null);
273 - if (config == null) {
274 - config = cfgAdmin.createFactoryConfiguration(componentName);
275 - }
276 Dictionary<String, Object> property = config.getProperties(); 273 Dictionary<String, Object> property = config.getProperties();
277 if (property == null) { 274 if (property == null) {
278 property = new Hashtable<>(); 275 property = new Hashtable<>();
......