- std::string condition;
- condition += (it_code != it->end()) ? *it_code : ""; condition += "|";
- condition += (it_bitR != it->end()) ? *it_bitR : ""; condition += "|";
- condition += (it_hopByHop != it->end()) ? *it_hopByHop : ""; condition += "|";
- condition += (it_applicationId != it->end()) ? *it_applicationId : ""; condition += "|";
- condition += (it_sessionId != it->end()) ? *it_sessionId : ""; condition += "|";
- condition += (it_resultCode != it->end()) ? *it_resultCode : ""; condition += "|";
- condition += (it_msisdn != it->end()) ? *it_msisdn : ""; condition += "|";
- condition += (it_imsi != it->end()) ? *it_imsi : ""; condition += "|";
- condition += (it_serviceContextId != it->end()) ? *it_serviceContextId : "";
-
- if (opType == "/testid-waitfe")
- result = eop.test_id__waitfe(response, atoi(param1.c_str()), condition);
- else
- result = eop.test_id__waitfc(response, atoi(param1.c_str()), condition);
+ std::string p1 = (it_code != it->end() && it_code->is_string()) ? *it_code : "";
+ std::string p2 = (it_bitR != it->end() && it_bitR->is_string()) ? *it_bitR : "";
+ std::string p3 = (it_hopByHop != it->end() && it_hopByHop->is_string()) ? *it_hopByHop : "";
+ std::string p4 = (it_applicationId != it->end() && it_applicationId->is_string()) ? *it_applicationId : "";
+ std::string p5 = (it_sessionId != it->end() && it_sessionId->is_string()) ? *it_sessionId : "";
+ std::string p6 = (it_resultCode != it->end() && it_resultCode->is_string()) ? *it_resultCode : "";
+ std::string p7 = (it_msisdn != it->end() && it_msisdn->is_string()) ? *it_msisdn : "";
+ std::string p8 = (it_imsi != it->end() && it_imsi->is_string()) ? *it_imsi : "";
+ std::string p9 = (it_serviceContextId != it->end() && it_serviceContextId->is_string()) ? *it_serviceContextId : "";
+
+ result = eop.test_id__waitfefc(response, atoi(param1.c_str()), (opType == "/testid-waitfe"), p1, p2, p3, p4, p5, p6, p7, p8, p9);