Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986

Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f

1 files changed, 8 insertions, 1 deletions

diff --git a/framework/src/onos/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java b/framework/src/onos/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
index a1abd188..0fccef81 100644
--- a/framework/src/onos/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
+++ b/framework/src/onos/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
@@ -17,10 +17,13 @@ package org.onosproject.cfg;
 
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Adapter for testing against component configuration service.
  */
 public class ComponentConfigAdapter implements ComponentConfigService {
+
     @Override
     public Set<String> getComponentNames() {
         return null;
@@ -38,7 +41,7 @@ public class ComponentConfigAdapter implements ComponentConfigService {
 
     @Override
     public Set<ConfigProperty> getProperties(String componentName) {
-        return null;
+        return ImmutableSet.of();
     }
 
     @Override
@@ -47,6 +50,10 @@ public class ComponentConfigAdapter implements ComponentConfigService {
     }
 
     @Override
+    public void preSetProperty(String componentName, String name, String value) {
+    }
+
+    @Override
     public void unsetProperty(String componentName, String name) {
 
     }