commit 8c6a7e8a3924bcce33491a78ea732cb15096e8a1
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Mar 14 18:35:43 2017 -0700
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Mar 14 18:35:43 2017 -0700
tree 6ce9829c72da952278cea09dc0cddd533aff5d26
parent cf3e368d499d549319894ab78e0bf76e1eb70177

fix NPE in netconf SBI

Change-Id: Ifae25d8eb0c5199095db5d94a7aabac108092369

providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java

diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 696617b..898273c 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -535,8 +535,8 @@
             if (mastershipService.getMasterFor(event.subject().id()) == null) {
                 return true;
             }
-            return event.subject().annotations().value(AnnotationKeys.PROTOCOL)
-                    .equals(SCHEME_NAME.toUpperCase()) &&
+            return SCHEME_NAME.toUpperCase()
+                    .equals(event.subject().annotations().value(AnnotationKeys.PROTOCOL)) &&
                     mastershipService.isLocalMaster(event.subject().id());
         }
     }