From 5bbd9feb84660d06fe635a0cd4cbdf45b110665c Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 25 Sep 2018 11:21:09 +0200 Subject: Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433) Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6 Signed-off-by: Michal Cmarada --- .../main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java | 2 +- .../java/io/fd/hc2vpp/common/translate/util/MultiNamingContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate') diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java index fbf8900f6..3f5a56fb2 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java @@ -85,7 +85,7 @@ public interface AddressTranslator extends Ipv4Translator, Ipv6Translator, MacTr // safest way to compare addresses - prevents returning false while using different types from hierarchy // Ex. Key for MapResolver contains Ipv4Address as value but we translate addresses from binary data to Ipv4AddressNoZone default boolean addressesEqual(final IpAddress left, final IpAddress right) { - return Arrays.equals(left.getValue(), right.getValue()); + return left.stringValue().equalsIgnoreCase(right.stringValue()); } /** diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MultiNamingContext.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MultiNamingContext.java index 4d0e7a98f..9560e48b1 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MultiNamingContext.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MultiNamingContext.java @@ -116,7 +116,7 @@ public class MultiNamingContext { // overrides old data with new(without removed child) mappingContext.put(getMappingIid(parentName), new MappingBuilder() .setName(mapping.getName()) - .setKey(mapping.getKey()) + .withKey(mapping.key()) .setValue(mapping.getValue() .stream() .filter(value -> !value.getName().equals(childName)) -- cgit 1.2.3-korg