From fce3bb305938483ec1bc4f5c925cbc7cd78c2333 Mon Sep 17 00:00:00 2001 From: Dhruv Bhardwaj Date: Tue, 7 Aug 2018 15:41:46 -0400 Subject: [PATCH] Add check in cp state to avoid npe Change-Id: I27469f5e95e7a20a5110628515ce099e760d1a51 --- .../openroadminterfaces/OpenRoadmInterfacesImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java index 6eaaec541..af8c10e79 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java @@ -120,7 +120,7 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { otuBuilder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder( intf2Delete.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class)); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class)); OtuBuilder otu = new OtuBuilder(otuBuilder.getOtu()); if (otu.getMaintLoopback() != null) { MaintLoopbackBuilder maintLoopBackBuilder = new MaintLoopbackBuilder(); @@ -200,12 +200,12 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { CircuitPacksBuilder cpBldr = new CircuitPacksBuilder(cp); boolean change = false; if (activate) { - if (!cpBldr.getEquipmentState().equals(States.NotReservedInuse)) { + if (cpBldr.getEquipmentState()!=null && !cpBldr.getEquipmentState().equals(States.NotReservedInuse)) { cpBldr.setEquipmentState(States.NotReservedInuse); change = true; } } else { - if (!cpBldr.getEquipmentState().equals(States.NotReservedAvailable)) { + if ((cpBldr.getEquipmentState()!=null && !cpBldr.getEquipmentState().equals(States.NotReservedAvailable))) { cpBldr.setEquipmentState(States.NotReservedAvailable); change = true; } @@ -239,4 +239,4 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { } } -} +} \ No newline at end of file -- 2.36.6