Added change to the null condition check for the policy threshold

This commit is contained in:
Cyrus 2022-02-14 14:46:15 -05:00
parent d353854835
commit 81068850bd

View File

@ -473,13 +473,14 @@ public class PolicyPageController extends PageController<NoPageParams> {
if (generateCertificateEnabled) { if (generateCertificateEnabled) {
threshold = ppModel.getThresholdValue(); threshold = ppModel.getThresholdValue();
if (threshold == null) {
threshold = SupplyChainPolicy.YEAR;
}
} else { } else {
threshold = ppModel.getReissueThreshold(); threshold = ppModel.getReissueThreshold();
} }
if (threshold == null || threshold.isEmpty()) {
threshold = SupplyChainPolicy.YEAR;
}
policy.setReissueThreshold(threshold); policy.setReissueThreshold(threshold);
} else { } else {
generateCertificateEnabled = false; generateCertificateEnabled = false;
@ -542,13 +543,14 @@ public class PolicyPageController extends PageController<NoPageParams> {
if (generateDevIdCertificateEnabled) { if (generateDevIdCertificateEnabled) {
threshold = ppModel.getDevIdThresholdValue(); threshold = ppModel.getDevIdThresholdValue();
if (threshold == null) {
threshold = SupplyChainPolicy.YEAR;
}
} else { } else {
threshold = ppModel.getDevIdReissueThreshold(); threshold = ppModel.getDevIdReissueThreshold();
} }
if (threshold == null || threshold.isEmpty()) {
threshold = SupplyChainPolicy.YEAR;
}
policy.setDevIdReissueThreshold(threshold); policy.setDevIdReissueThreshold(threshold);
} else { } else {
generateDevIdCertificateEnabled = false; generateDevIdCertificateEnabled = false;