Fix findbug and checkstyle issues

[bgpcep.git] / bgp / path-selection-mode / src / main / java / org / opendaylight / protocol / bgp / mode / impl / add / RouteKey.java

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/RouteKey.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/RouteKey.java
index 9e1211c6b9d9e184acff380478b183a70d5faeb5..faf54d9d1d79c0895d30b93da240f2f915028275 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/RouteKey.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/RouteKey.java
@@ -17,7 +17,7 @@ public final class RouteKey implements Comparable<RouteKey> {
 
     public RouteKey(final UnsignedInteger routerId, final Long remotePathId) {
         this.routerId = routerId;
-        this.remotePathId = remotePathId == null ? 0 : remotePathId;
+        this.remotePathId = remotePathId != null ? remotePathId : 0;
     }
 
     private Long getExternalPathId() {
@@ -65,6 +65,7 @@ public final class RouteKey implements Comparable<RouteKey> {
     @Override
     public int compareTo(@Nonnull final RouteKey otherRouteKey) {
         final int routeIdCompareTo = this.routerId.compareTo(otherRouteKey.getRouteId());
-        return routeIdCompareTo == 0 ? this.remotePathId.compareTo(otherRouteKey.getExternalPathId()) : routeIdCompareTo;
+        return routeIdCompareTo == 0 ? this.remotePathId.compareTo(otherRouteKey.getExternalPathId())
+                : routeIdCompareTo;
     }
 }