Merge "Update roadm devicemanagers"

[ccsdk/features.git] / sdnr / wt / devicemanager-onap / openroadm / provider / src / main / java / org / onap / ccsdk / features / sdnr / wt / devicemanager / openroadm / impl / InitialDeviceAlarmReader.java

diff --git a/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/InitialDeviceAlarmReader.java b/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/InitialDeviceAlarmReader.java
index 6c88373..6472e66 100644 (file)
--- a/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/InitialDeviceAlarmReader.java
+++ b/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/InitialDeviceAlarmReader.java
@@ -68,8 +68,9 @@ public class InitialDeviceAlarmReader {
     // Mapping the alarm data with the fault data
     protected FaultData writeFaultData() {
         FaultData faultData = new FaultData();
-        if (this.getActiveAlarmList(this.netConfAccesor).getActiveAlarms() != null) {
-            Collection<ActiveAlarms> activeAlarms = YangHelper.getCollection(this.getActiveAlarmList(this.netConfAccesor).getActiveAlarms());
+        ActiveAlarmList actAlarmList = this.getActiveAlarmList(this.netConfAccesor);
+        if (actAlarmList != null) {
+            Collection<ActiveAlarms> activeAlarms = YangHelper.getCollection(actAlarmList.getActiveAlarms());
             if (!activeAlarms.isEmpty()) {
                 for (ActiveAlarms activeAlarm : activeAlarms) {
                     faultData.add(this.netConfAccesor.getNodeId(), this.count, activeAlarm.getRaiseTime(),