@@ -2258,19 +2258,20 @@ void ChargePointImpl::handleGetInstalledCertificateIdsRequest(ocpp::Call<GetInst
2258
2258
if (call.msg .certificateType == CertificateUseEnumType::ManufacturerRootCertificate) {
2259
2259
certificate_types.push_back (ocpp::CertificateType::MFRootCertificate);
2260
2260
}
2261
-
2262
2261
// this is common CertificateHashDataChain
2263
2262
const auto certificate_hash_data_chains = this ->evse_security ->get_installed_certificates (certificate_types);
2264
- // convert ocpp::CertificateHashData to v16::CertificateHashData
2265
- std::optional<std::vector<CertificateHashDataType>> certificate_hash_data_16_vec_opt;
2266
- std::vector<CertificateHashDataType> certificate_hash_data_16_vec;
2267
- for (const auto certificate_hash_data_chain_entry : certificate_hash_data_chains) {
2268
- certificate_hash_data_16_vec.push_back (
2269
- CertificateHashDataType (json (certificate_hash_data_chain_entry.certificateHashData )));
2270
- }
2271
- certificate_hash_data_16_vec_opt.emplace (certificate_hash_data_16_vec);
2272
- response.certificateHashData = certificate_hash_data_16_vec_opt;
2273
- response.status = GetInstalledCertificateStatusEnumType::Accepted;
2263
+ if (!certificate_hash_data_chains.empty ()) {
2264
+ // convert ocpp::CertificateHashData to v16::CertificateHashData
2265
+ std::optional<std::vector<CertificateHashDataType>> certificate_hash_data_16_vec_opt;
2266
+ std::vector<CertificateHashDataType> certificate_hash_data_16_vec;
2267
+ for (const auto certificate_hash_data_chain_entry : certificate_hash_data_chains) {
2268
+ certificate_hash_data_16_vec.push_back (
2269
+ CertificateHashDataType (json (certificate_hash_data_chain_entry.certificateHashData )));
2270
+ }
2271
+ certificate_hash_data_16_vec_opt.emplace (certificate_hash_data_16_vec);
2272
+ response.certificateHashData = certificate_hash_data_16_vec_opt;
2273
+ response.status = GetInstalledCertificateStatusEnumType::Accepted;
2274
+ }
2274
2275
2275
2276
ocpp::CallResult<GetInstalledCertificateIdsResponse> call_result (response, call.uniqueId );
2276
2277
this ->send <GetInstalledCertificateIdsResponse>(call_result);
0 commit comments