commit 968f93f3ad3836645a09f9777f4f92ddd63d30f0
author Andrea Campanella <andrea@onlab.us> Thu Jun 08 11:09:28 2017 +0200
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri Jun 09 16:33:04 2017 +0000
tree 7fc63a0c21425c635805f8458f92f3628bbe48cc
parent 644a266290406d31a5879e754e37ddbb41cea2f7

Updating device event isRelevant check Netconf

Change-Id: I98b41d9c00a6043784382e9728bc9e465f4932e0

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 7a31150..72fc13f 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
@@ -631,8 +631,8 @@
             if (mastershipService.getMasterFor(event.subject().id()) == null) {
                 return true;
             }
-            return SCHEME_NAME.toUpperCase()
-                    .equals(event.subject().annotations().value(AnnotationKeys.PROTOCOL)) &&
+            return (SCHEME_NAME.equalsIgnoreCase(event.subject().annotations().value(AnnotationKeys.PROTOCOL)) ||
+                    (SCHEME_NAME.equalsIgnoreCase(event.subject().id().uri().getScheme()))) &&
                     mastershipService.isLocalMaster(event.subject().id());
         }
     }