commit d5c3b9307288f4b68d8d613f6a231ebf0d9d430f
author Charles Chan <rascov@gmail.com> Thu Sep 22 17:49:52 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 23 05:51:17 2016 +0000
tree 58e7393e8a7dd59dd91b3ab97a92b69a3452ebfc
parent 852fecd1b641bca8cfd17a204c7c7114d9cbe2cb

Bugfix: default value is not applied to config correctly

This could further cause NPE somewhere else where a default value is expected

Change-Id: I71c8f87b5e25b6e5445e03527ee82d84ff05086c

core/api/src/main/java/org/onosproject/net/config/Config.java

diff --git a/core/api/src/main/java/org/onosproject/net/config/Config.java b/core/api/src/main/java/org/onosproject/net/config/Config.java
index 4dce014..1b57cdb 100644
--- a/core/api/src/main/java/org/onosproject/net/config/Config.java
+++ b/core/api/src/main/java/org/onosproject/net/config/Config.java
@@ -322,7 +322,7 @@
      */
     protected <E extends Enum<E>> E get(String name, E defaultValue, Class<E> enumClass) {
         if (defaultValue != null) {
-            Enum.valueOf(enumClass, object.path(name).asText(defaultValue.toString()));
+            return Enum.valueOf(enumClass, object.path(name).asText(defaultValue.toString()));
         }
 
         JsonNode node = object.get(name);