From d5e1e3a563807561caa0b64c414332d85a31f216 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 21 Dec 2016 11:00:09 +0100 Subject: Fix interface read when alcs are not configured Change-Id: Id780d9f503901d551f5a9d5693ca0a28cf596a5c Signed-off-by: Marek Gradzki --- .../main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'acl/acl-impl/src/main/java') diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java index 90f2b2fe2..948b6408a 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java @@ -102,7 +102,13 @@ public class VppAclCustomizer extends FutureJVppAclCustomizer dump.aclInterfaceListDetails = dump.aclInterfaceListDetails .stream() .map(iface -> { - iface.acls = Arrays.copyOfRange(iface.acls, 0, iface.nInput - 1); + if (iface.acls != null && iface.acls.length > 0) { + if (iface.nInput <= 0) { + iface.acls = new int[0]; + } else { + iface.acls = Arrays.copyOfRange(iface.acls, 0, iface.nInput); + } + } return iface; }) .collect(Collectors.toList()); @@ -116,7 +122,11 @@ public class VppAclCustomizer extends FutureJVppAclCustomizer dump.aclInterfaceListDetails = dump.aclInterfaceListDetails .stream() .map(iface -> { - iface.acls = Arrays.copyOfRange(iface.acls, iface.nInput, iface.acls.length); + if (iface.nInput >= iface.acls.length) { + iface.acls = new int[0]; + } else { + iface.acls = Arrays.copyOfRange(iface.acls, iface.nInput, iface.acls.length); + } return iface; }) .collect(Collectors.toList()); -- cgit 1.2.3-korg