From 808ba031c16c2c32efe287af70d8bc01ba15dc81 Mon Sep 17 00:00:00 2001 From: Alexandru Balan Date: Mon, 30 Mar 2015 15:19:59 +0000 Subject: [PATCH] Merged BRANCHES/V2.2 to BRANCHES/V2.3: 100725: RM-1586 : Add another search for the property in the case of legacy html encoded properties git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@100726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../script/CustomPropertyDefinitionPut.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java index 5f37381f55..3b4e07854f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java @@ -134,7 +134,11 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript String propId = (String)params.get(PROP_ID); ParameterCheck.mandatoryString("propId", propId); - QName propQName = rmAdminService.getQNameForClientId(URLEncoder.encode(propId)); + QName propQName = rmAdminService.getQNameForClientId(propId); + if (propQName == null) + { + propQName = rmAdminService.getQNameForClientId(URLEncoder.encode(propId)); + } if (propQName == null) { throw new WebScriptException(Status.STATUS_NOT_FOUND,