X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fopenroadminterfaces%2FOpenRoadmInterfacesImpl.java;h=af8c10e796ce48fb8189e81af9fbd17a04306d45;hb=fce3bb305938483ec1bc4f5c925cbc7cd78c2333;hp=6eaaec54198ae92ae4f8621119164c29c7ed160f;hpb=20edcd3abf304a96abb40c171ab686fb962599f4;p=transportpce.git 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