commit 0044f572aa92ecc47e3894d07c789ae5d7db7d1e
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Sep 09 14:14:59 2015 -0700
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Sep 09 14:15:41 2015 -0700
tree cee92612bee7649f00783f828844ee395bd388a4
parent d275afd566cf55bd44ede20c313d35102e523df2

Use equals() for comparison of String

Change-Id: I825ed37f0aec36d6c7f7de96953de6b80a8802b3

core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index a7d488b..7900d18 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -28,6 +28,8 @@
 import org.onosproject.net.device.DeviceDescription;
 import org.slf4j.Logger;
 
+import java.util.Objects;
+
 /**
  * Implementations of merge policies for various sources of device configuration
  * information. This includes applications, provides, and network configurations.
@@ -73,7 +75,7 @@
      */
     public static SparseAnnotations combine(BasicDeviceConfig bdc, SparseAnnotations an) {
         DefaultAnnotations.Builder newBuilder = DefaultAnnotations.builder();
-        if (bdc.driver() != an.value(AnnotationKeys.DRIVER)) {
+        if (!Objects.equals(bdc.driver(), an.value(AnnotationKeys.DRIVER))) {
             newBuilder.set(AnnotationKeys.DRIVER, bdc.driver());
         }
         if (bdc.name() != null) {