BUG-6237: Topology freezes or slows down due to java.util.concurrent.TimeoutException

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

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseComplexRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseComplexRouteEntry.java
index 9dd20a71a912b79234d5906a5dea4d1cd0306438..04c22444aafc9c2ec0e8450a2e4715e32e3467a2 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseComplexRouteEntry.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseComplexRouteEntry.java
@@ -9,7 +9,6 @@ package org.opendaylight.protocol.bgp.mode.impl.base;
 
 import com.google.common.primitives.UnsignedInteger;
 import org.opendaylight.protocol.bgp.mode.api.BestPath;
-import org.opendaylight.protocol.bgp.mode.impl.OffsetMap;
 import org.opendaylight.protocol.bgp.mode.spi.RouteEntryUtil;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
@@ -22,9 +21,9 @@ final class BaseComplexRouteEntry extends BaseAbstractRouteEntry {
 
     @Override
     public int addRoute(final UnsignedInteger routerId, final Long remotePathId, final NodeIdentifier attrII, final NormalizedNode<?, ?> data) {
-        final OffsetMap<UnsignedInteger> oldMap = getOffsets();
+        final OffsetMap oldMap = getOffsets();
         final int offset = super.addRoute(routerId, remotePathId, attrII, data);
-        final OffsetMap<UnsignedInteger> newMap = getOffsets();
+        final OffsetMap newMap = getOffsets();
 
         if (!newMap.equals(oldMap)) {
             this.values = newMap.expand(oldMap, this.values, offset);
@@ -36,7 +35,7 @@ final class BaseComplexRouteEntry extends BaseAbstractRouteEntry {
 
     @Override
     public boolean removeRoute(final UnsignedInteger routerId, final Long remotePathId) {
-        final OffsetMap<UnsignedInteger> map = getOffsets();
+        final OffsetMap map = getOffsets();
         final int offset = map.offsetOf(routerId);
         this.values = map.removeValue(this.values, offset);
         return removeRoute(routerId, offset);
@@ -44,7 +43,7 @@ final class BaseComplexRouteEntry extends BaseAbstractRouteEntry {
 
     @Override
     public MapEntryNode createValue(final PathArgument routeId, final BestPath path) {
-        final OffsetMap<UnsignedInteger> map = getOffsets();
+        final OffsetMap map = getOffsets();
         final MapEntryNode mapValues = map.getValue(this.values, map.offsetOf(path.getRouterId()));
         return RouteEntryUtil.createComplexRouteValue(routeId, path, mapValues);
     }