From d726d0f173544c8d0078c5f918b5d086f6e85f79 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 1 Apr 2019 11:39:35 +0200 Subject: HC2VPP-406: fix build errors after ODL bump to neon This fixes build issues after ODL bump in Honeycomb (HONEYCOMB-443). Change-Id: I3bf203dd60d12057595b15ce1ad59302dc14e2a0 Signed-off-by: Michal Cmarada --- .../src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java') diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java index 81a978559..6d1cf812c 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java @@ -79,10 +79,10 @@ final class NatInstanceCustomizer // Find the nat instance IDs (vrf-ids) by listing all static mappings and their VRF assignment final List vrfIds = Stream.concat( nat44DumpManager.getDump(id, context.getModificationCache()) - .or(new Nat44StaticMappingDetailsReplyDump()).nat44StaticMappingDetails.stream() + .orElse(new Nat44StaticMappingDetailsReplyDump()).nat44StaticMappingDetails.stream() .map(detail -> detail.vrfId), nat64DumpManager.getDump(id, context.getModificationCache()) - .or(new Nat64BibDetailsReplyDump()).nat64BibDetails.stream() + .orElse(new Nat64BibDetailsReplyDump()).nat64BibDetails.stream() .map(detail -> detail.vrfId)) // V4 (nat44) and V6 (nat64) VRFs in VPP can have the same id. We store them under single nat instance, // because the ietf-nat model does not require separate instances for nat44 and nat64 features. -- cgit 1.2.3-korg