commit b46d2200f30192ca67f4f96b36ce3ba3d9684417
author Palash Kala <palash.kala@samsung.com> Thu Mar 30 19:23:26 2017 +0900
committer Satishk-Huawei <satishk@huawei.com> Fri Mar 31 06:11:47 2017 +0000
tree b92506d41e78f4156dc7f47aecf50621f9b83783
parent 2349ac9cfb96450ecf31a5cc32e9c028f7bcfa36

A part of if condition in the code is not necessary

Change-Id: I7c23633647bb91d0c311bf11cf479fd1f89e2ca3

protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java

diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
index 76b9712..88a8c60 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
@@ -85,8 +85,7 @@
             return compareMed(obj1Med, obj2Med);
         }
 
-        if ((pathNlriDetails1 != null || pathNlriDetails2 != null) && (pathNlriDetails1 != null && !pathNlriDetails1
-                        .equals(pathNlriDetails2))) {
+        if (!pathNlriDetails1.equals(pathNlriDetails2)) {
             return comparePeerDetails(pathNlriDetails1, pathNlriDetails2);
         }
         return 0;
@@ -156,10 +155,10 @@
     int comparePeerDetails(PathAttrNlriDetailsLocalRib pathNlriDetails1, PathAttrNlriDetailsLocalRib pathNlriDetails2) {
         // consider EBGP over IBGP
         if (pathNlriDetails1.isLocalRibIbgpSession() != pathNlriDetails2.isLocalRibIbgpSession()) {
-            if (pathNlriDetails1 == null || pathNlriDetails1.isLocalRibIbgpSession()) {
+            if (pathNlriDetails1.isLocalRibIbgpSession()) {
                 return -1;
             }
-            if (pathNlriDetails2 == null || pathNlriDetails2.isLocalRibIbgpSession()) {
+            if (pathNlriDetails2.isLocalRibIbgpSession()) {
                 return 1;
             }
         }