scottk/wlan-cloud-services
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-services.git synced 2025-10-31 18:47:56 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

[WIFI-3218] Adding null checks to RrmBulkUpdateItem

Browse Source
This commit is contained in:
ralphlee
2021-07-22 17:19:03 -04:00
parent aac34150b2
commit 02e03780db
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
equipment-models/src/main/java/com/telecominfraproject/wlan/equipment/models/bulkupdate/rrm/EquipmentRrmBulkUpdateItem.java
View File

@@ -118,34 +118,41 @@ public class EquipmentRrmBulkUpdateItem extends BaseJsonModel {
finalDetails.getRadioMap().put(rt, erc); finalDetails.getRadioMap().put(rt, erc);
} }
if(erc.getManualChannelNumber()== null || erc.getManualChannelNumber().intValue() != updateDetails.getChannelNumber()) { if(erc.getManualChannelNumber() == null
|| erc.getManualChannelNumber().intValue() != updateDetails.getChannelNumber()) {
erc.setManualChannelNumber(updateDetails.getChannelNumber()); erc.setManualChannelNumber(updateDetails.getChannelNumber());
modelChanged.set(true); modelChanged.set(true);
} }
if(erc.getManualBackupChannelNumber()== null || if(erc.getManualBackupChannelNumber() == null
erc.getManualBackupChannelNumber().intValue() != updateDetails.getBackupChannelNumber()) { || erc.getManualBackupChannelNumber().intValue() != updateDetails.getBackupChannelNumber()) {
erc.setManualBackupChannelNumber(updateDetails.getBackupChannelNumber()); erc.setManualBackupChannelNumber(updateDetails.getBackupChannelNumber());
modelChanged.set(true); modelChanged.set(true);
} }
if (updateDetails.getClientDisconnectThresholdDb() != null) {
if ((erc.getClientDisconnectThresholdDb() == null && updateDetails.getClientDisconnectThresholdDb() != null) if ((erc.getClientDisconnectThresholdDb() == null && updateDetails.getClientDisconnectThresholdDb() != null)
|| !erc.getClientDisconnectThresholdDb().equals(updateDetails.getClientDisconnectThresholdDb())) { || !erc.getClientDisconnectThresholdDb().equals(updateDetails.getClientDisconnectThresholdDb())) {
erc.setClientDisconnectThresholdDb(updateDetails.getClientDisconnectThresholdDb()); erc.setClientDisconnectThresholdDb(updateDetails.getClientDisconnectThresholdDb());
modelChanged.set(true); modelChanged.set(true);
} }
}
if (updateDetails.getProbeResponseThresholdDb() != null) {
if ((erc.getProbeResponseThresholdDb() == null && updateDetails.getProbeResponseThresholdDb() != null) if ((erc.getProbeResponseThresholdDb() == null && updateDetails.getProbeResponseThresholdDb() != null)
|| !erc.getProbeResponseThresholdDb().equals(updateDetails.getProbeResponseThresholdDb())) { || !erc.getProbeResponseThresholdDb().equals(updateDetails.getProbeResponseThresholdDb())) {
erc.setProbeResponseThresholdDb(updateDetails.getProbeResponseThresholdDb()); erc.setProbeResponseThresholdDb(updateDetails.getProbeResponseThresholdDb());
modelChanged.set(true); modelChanged.set(true);
} }
}
if (updateDetails.getRxCellSizeDb() != null) {
if ((erc.getRxCellSizeDb() == null && updateDetails.getRxCellSizeDb() != null) if ((erc.getRxCellSizeDb() == null && updateDetails.getRxCellSizeDb() != null)
|| !erc.getRxCellSizeDb().equals(updateDetails.getRxCellSizeDb())) { || !erc.getRxCellSizeDb().equals(updateDetails.getRxCellSizeDb())) {
erc.setRxCellSizeDb(updateDetails.getRxCellSizeDb()); erc.setRxCellSizeDb(updateDetails.getRxCellSizeDb());
modelChanged.set(true); modelChanged.set(true);
} }
}
RadioConfiguration arc = finalDetails.getAdvancedRadioMap().get(rt); RadioConfiguration arc = finalDetails.getAdvancedRadioMap().get(rt);