commit 3a15b283c547f4b67599a5d73a598ac23704a47e
author Charles Chan <rascov@gmail.com> Tue Feb 20 10:29:05 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Tue Feb 20 18:54:29 2018 +0000
tree a47d079c3fdd216a8f05b55b7a02e3521e58422a
parent e2dd80578d44bea40724cef5f399a72bc7a8e64d

Fix Sonar warning - remove redundant condition check

Change-Id: I53949ac17b83c9dc72669586a2c0193170fd4f74

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
index 17456f9..dac5aac 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
@@ -138,7 +138,7 @@
 
         Boolean directConnFlag = directlyConnected(lq6Reply);
         ConnectPoint inPort = context.inPacket().receivedFrom();
-        if ((directConnFlag || (!directConnFlag && indirectDhcpServerIp == null))
+        if ((directConnFlag || indirectDhcpServerIp == null)
                 && !inPort.equals(dhcpServerConnectPoint)) {
             log.warn("Receiving port {} is not the same as server connect point {} for direct or indirect-null",
                      inPort, dhcpServerConnectPoint);