From 435aadfdffda5b498853c2787d4ca494f79fbf4d Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 18 Sep 2014 17:31:28 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84221: Defensive code around missing namespace check for WorkflowQNameConverter git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/workflow/WorkflowQNameConverter.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java b/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java index f1c70d9c4c..1bc75a8515 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java @@ -19,6 +19,7 @@ package org.alfresco.repo.workflow; +import org.alfresco.service.namespace.NamespaceException; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -100,7 +101,14 @@ public class WorkflowQNameConverter } qName = name.replaceFirst("_", ":"); } - return QName.createQName(qName, prefixResolver); + try + { + return QName.createQName(qName, prefixResolver); + } + catch (NamespaceException ne) + { + return QName.createQName(NamespaceService.DEFAULT_URI, name); + } } private String convertQNameToName(QName name)