diff options
| author | Cernat Cosmin (uidv0912) <uidv0912@iav5723u.cw01.contiwan.com> | 2015-10-13 15:46:14 +0300 |
|---|---|---|
| committer | Cernat Cosmin (uidv0912) <uidv0912@iav5723u.cw01.contiwan.com> | 2015-10-13 15:46:29 +0300 |
| commit | 97926a546362d58fbca21ab8ccd3a358342db1f7 (patch) | |
| tree | a470bd4e2e47f66d18d1646c5850839963a2e5ae | |
| parent | ce8a9a2e677b5f127de676689279ce90e1c1f9b0 (diff) | |
| download | persistence-administrator-97926a546362d58fbca21ab8ccd3a358342db1f7.tar.gz | |
Takeover fix for Bug 299 from Continental git branch
Change-Id: Id6ffd1c12f704ae2006f0cde21b8c6d8fd7228d3
Signed-off-by: Cernat Cosmin <cosmin.cernat@continental-corporation.com>
| -rw-r--r-- | Administrator/src/ssw_pers_admin_config.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Administrator/src/ssw_pers_admin_config.c b/Administrator/src/ssw_pers_admin_config.c index be130da..8b8cd8e 100644 --- a/Administrator/src/ssw_pers_admin_config.c +++ b/Administrator/src/ssw_pers_admin_config.c @@ -12,7 +12,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Date Author Reason -* 2015.10.13 Cosmin Cernat Bug 299: Fixed error in persAdmCfgExcGetSizeResourcesList() +* 2015.10.13 Cosmin Cernat Takeover fix for Bug 299 from Continental git branch +* 2015.10.13 Cosmin Cernat Bug 299: Fixed error in persAdmCfgGroupContentGetSizeMembersList() * 2014.02.22 Ionut Ieremie CSP_WZ#8795: cfg_priv_json_open_internal_handle - pFileBuffer needs to end in '\0' * 2014.02.21 Ionut Ieremie CSP_WZ#8795: Improve performance by parsing the JSON files only once (at handle opening) * 2013.10.04 Ionut Ieremie CSP_WZ#5962: Initialisation of Default Value does not work for big key (>63 bytes) @@ -702,19 +703,18 @@ signed int persAdmCfgGroupContentGetSizeMembersList(signed int handlerGroupConte signed int siResult = PAS_SUCCESS; siResult = cfg_priv_handle_check_validity(handlerGroupContent, PersAdminCfgFileType_GroupContent) ; - if(PAS_SUCCESS != siResult) - { - DLT_LOG(persAdminSvcDLTCtx, DLT_LOG_ERROR, DLT_STRING(LT_HDR), DLT_STRING(__FUNCTION__), - DLT_STRING(" - invalid input parameters")); - siResult = PAS_FAILURE_INVALID_PARAMETER; - } if(PAS_SUCCESS == siResult) { /* get size */ siResult = cfg_priv_json_parse_get_keys_all_size(g_sHandles[handlerGroupContent].sJsonHandle.pJsonObj); } - + else + { + DLT_LOG(persAdminSvcDLTCtx, DLT_LOG_ERROR, DLT_STRING(LT_HDR), DLT_STRING(__FUNCTION__), + DLT_STRING(" - invalid input parameters")); + siResult = PAS_FAILURE_INVALID_PARAMETER; + } /* return size */ return siResult; |