BUG-6411: Fix RibImpl global comparison 52/43952/2
authorClaudio D. Gasparini <cgaspari@cisco.com>
Mon, 15 Aug 2016 08:40:39 +0000 (10:40 +0200)
committerClaudio D. Gasparini <cgaspari@cisco.com>
Mon, 15 Aug 2016 09:52:20 +0000 (09:52 +0000)
Fix RibImpl global comparison by compare Ipv4
by comparing value instead of both obj

Change-Id: I922219085662baa7f99f77d1e4797c5d84f640b1
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
(cherry picked from commit b9c848cd7bc1270ed64c36006d27c22a04e4ec54)

bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java

index 44c35d333522c38f5691ed5bb4c47a794e341025..66716a365a3f5f341e07919d41d3711d306dcc1f 100644 (file)
@@ -96,7 +96,7 @@ public final class RibImpl implements RIB, AutoCloseable {
         final AsNumber globalAs = global.getConfig().getAs();
         final Ipv4Address globalRouterId = global.getConfig().getRouterId();
         return this.afiSafi.containsAll(globalAfiSafi) && globalAfiSafi.containsAll(this.afiSafi)
-            && globalAs.equals(this.asNumber) && globalRouterId.equals(this.routerId);
+            && globalAs.equals(this.asNumber) && globalRouterId.getValue().equals(this.routerId.getValue());
     }
 
     @Override