From 6595bdaeeec4c91bd97b2a405d3ec01e453a1143 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 25 Feb 2010 03:58:32 +0000 Subject: [PATCH] Merge DEV/BELARUS/HEAD-2010_02_22 to HEAD 18814 : Implementation of sub-tasks SAIL-326, SAIL-327 and SAIL-329 is complete. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/template/ShortQNameMethod.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/java/org/alfresco/repo/template/ShortQNameMethod.java b/source/java/org/alfresco/repo/template/ShortQNameMethod.java index 97744c34e4..4bed143c74 100644 --- a/source/java/org/alfresco/repo/template/ShortQNameMethod.java +++ b/source/java/org/alfresco/repo/template/ShortQNameMethod.java @@ -28,6 +28,7 @@ import java.util.List; import org.alfresco.repo.processor.BaseProcessorExtension; import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.namespace.NamespaceException; import org.alfresco.service.namespace.QName; import freemarker.ext.beans.BeanModel; @@ -80,8 +81,16 @@ public final class ShortQNameMethod extends BaseProcessorExtension implements Te arg0String = ((TemplateScalarModel)arg0).getAsString(); } + try + { result = createQName(arg0String).toPrefixString(services.getNamespaceService()); } + catch (NamespaceException e) + { + // not valid qname -> return original value + result = arg0String; + } + } return result != null ? result : ""; }