commit 3da1a1827d115b2e0201a26c6d4b58f8627e935d
author Simon Hunt <simon@onlab.us> Mon Feb 08 16:42:54 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 09 01:20:37 2016 +0000
tree 71df070ac3dccbd8a7c68c3e840209f8519fa06d
parent 2f11bb33104f8d527aea5f29c65599c93c3654f5

Fix incorrect method prerequisite checks in NetworkConfigManager.

Change-Id: I460190952a4493544cf94dd0e2cec70ad1292ecb

core/net/src/main/java/org/onosproject/net/config/impl/NetworkConfigManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/config/impl/NetworkConfigManager.java b/core/net/src/main/java/org/onosproject/net/config/impl/NetworkConfigManager.java
index cdceec0..9f041e6 100644
--- a/core/net/src/main/java/org/onosproject/net/config/impl/NetworkConfigManager.java
+++ b/core/net/src/main/java/org/onosproject/net/config/impl/NetworkConfigManager.java
@@ -56,7 +56,7 @@
 
     private static final String NULL_FACTORY_MSG = "Factory cannot be null";
     private static final String NULL_SCLASS_MSG = "Subject class cannot be null";
-    private static final String NULL_SKEY_MSG = "Subject key cannot be null";
+    private static final String NULL_SCKEY_MSG = "Subject class key cannot be null";
     private static final String NULL_CCLASS_MSG = "Config class cannot be null";
     private static final String NULL_CKEY_MSG = "Config key cannot be null";
     private static final String NULL_SUBJECT_MSG = "Subject cannot be null";
@@ -159,7 +159,7 @@
 
     @Override
     public Class<? extends Config> getConfigClass(String subjectClassKey, String configKey) {
-        checkNotNull(subjectClassKey, NULL_SKEY_MSG);
+        checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
         checkNotNull(configKey, NULL_CKEY_MSG);
         return configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
     }
@@ -205,7 +205,7 @@
     public <S, C extends Config<S>> C applyConfig(S subject, Class<C> configClass, JsonNode json) {
         checkNotNull(subject, NULL_SUBJECT_MSG);
         checkNotNull(configClass, NULL_CCLASS_MSG);
-        checkNotNull(subject, NULL_JSON_MSG);
+        checkNotNull(json, NULL_JSON_MSG);
         return store.applyConfig(subject, configClass, json);
     }
 
@@ -213,10 +213,10 @@
     @SuppressWarnings("unchecked")
     public <S, C extends Config<S>> C applyConfig(String subjectClassKey, S subject,
                                                   String configKey, JsonNode json) {
-        checkNotNull(subjectClassKey, NULL_SKEY_MSG);
+        checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
         checkNotNull(subject, NULL_SUBJECT_MSG);
         checkNotNull(configKey, NULL_CKEY_MSG);
-        checkNotNull(subject, NULL_JSON_MSG);
+        checkNotNull(json, NULL_JSON_MSG);
         Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
         if (configClass != null) {
             return store.applyConfig(subject, (Class<C>) configClass, json);
@@ -236,9 +236,9 @@
 
     @Override
     public <S> void removeConfig(String subjectClassKey, S subject, String configKey) {
-        checkNotNull(subjectClassKey, NULL_SKEY_MSG);
+        checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
         checkNotNull(subject, NULL_SUBJECT_MSG);
-        checkNotNull(configKey, NULL_CCLASS_MSG);
+        checkNotNull(configKey, NULL_CKEY_MSG);
         Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
         if (configClass != null) {
             store.clearConfig(subject, configClass);