mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-06 04:36:17 +02:00
Code Issues Projects Releases Wiki Activity

Fix NPE in Microsemi Driver

Browse Source 
Change-Id: I1f9357f589769ce5fb835b95b31379a514116a6a
This commit is contained in:
Sean Condon 2017-12-19 23:34:10 +00:00 committed by Andrea Campanella
parent 479337514b
commit c45ede5f1c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/EA1000CfmMepProgrammable.java
View File

@ -195,13 +195,20 @@ public class EA1000CfmMepProgrammable extends AbstractHandlerBehaviour
try {
MseaCfm mseacfm =
mseaCfmService.getMepFull(mdName, maName, mepId, session);
for (org.onosproject.yang.gen.v1.mseacfm.rev20160229.
mseacfm.mefcfm.MaintenanceDomain replyMd:mseacfm.mefCfm().maintenanceDomain()) {
if (mseacfm != null && mseacfm.mefCfm() != null &&
mseacfm.mefCfm().maintenanceDomain() != null) {
for (org.onosproject.yang.gen.v1.mseacfm.rev20160229.
mseacfm.mefcfm.maintenancedomain.
MaintenanceAssociation replyMa:replyMd.maintenanceAssociation()) {
for (MaintenanceAssociationEndPoint replyMep:replyMa.maintenanceAssociationEndPoint()) {
return buildApiMepEntryFromYangMep(replyMep, handler().data().deviceId(), mdName, maName);
mseacfm.mefcfm.MaintenanceDomain replyMd :
mseacfm.mefCfm().maintenanceDomain()) {
for (org.onosproject.yang.gen.v1.mseacfm.rev20160229.
mseacfm.mefcfm.maintenancedomain.
MaintenanceAssociation replyMa :
replyMd.maintenanceAssociation()) {
for (MaintenanceAssociationEndPoint replyMep :
replyMa.maintenanceAssociationEndPoint()) {
return buildApiMepEntryFromYangMep(
replyMep, handler().data().deviceId(), mdName, maName);
}
}
}
}
@ -210,7 +217,7 @@ public class EA1000CfmMepProgrammable extends AbstractHandlerBehaviour
} catch (NetconfException e) {
log.error("Unable to get MEP {}/{}/{} on device {}",
mdName, maName, mepId, handler().data().deviceId());
throw new CfmConfigException("Unable to create MEP :" + e.getMessage());
throw new CfmConfigException("Unable to get MEP :" + e.getMessage());
}
}