diff options
author | Maros Marsalek <mmarsale@cisco.com> | 2016-07-21 15:53:33 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2016-07-25 09:05:08 +0000 |
commit | 32e03308ab9f232f38d4495847766e713791e1db (patch) | |
tree | abb6d56ae73ae8d2f2667c09aafb93385ba4fa1e /v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java | |
parent | 9e9cf0e506b3da8a101700401d3a1cebc1f27656 (diff) |
Fix Subinterface acl initalizer NPE
Change-Id: Ibd1b1cf66d702e440c2a575f69a977347f638e17
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java')
-rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java index 51adcc8f5..aa717cf98 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/SubInterfaceInitializationUtils.java @@ -78,11 +78,13 @@ final class SubInterfaceInitializationUtils { subInterfaceCfgBuilder.setIpv4(operationalData.getIpv4()); subInterfaceCfgBuilder.setIpv6(operationalData.getIpv6()); - final AclBuilder aclBuilder = new AclBuilder(); - aclBuilder.setL2Acl(operationalData.getAcl().getL2Acl()); - aclBuilder.setIp4Acl(operationalData.getAcl().getIp4Acl()); - aclBuilder.setIp6Acl(operationalData.getAcl().getIp6Acl()); - subInterfaceCfgBuilder.setAcl(aclBuilder.build()); + if (operationalData.getAcl() != null) { + final AclBuilder aclBuilder = new AclBuilder(); + aclBuilder.setL2Acl(operationalData.getAcl().getL2Acl()); + aclBuilder.setIp4Acl(operationalData.getAcl().getIp4Acl()); + aclBuilder.setIp6Acl(operationalData.getAcl().getIp6Acl()); + subInterfaceCfgBuilder.setAcl(aclBuilder.build()); + } return subInterfaceCfgBuilder.build(); } |