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
This commit is contained in:
Roy Wetherall
2010-02-25 03:58:32 +00:00
parent fb2fca76d1
commit 6595bdaeee

View File

@@ -28,6 +28,7 @@ import java.util.List;
import org.alfresco.repo.processor.BaseProcessorExtension; import org.alfresco.repo.processor.BaseProcessorExtension;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.namespace.NamespaceException;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeanModel;
@@ -80,8 +81,16 @@ public final class ShortQNameMethod extends BaseProcessorExtension implements Te
arg0String = ((TemplateScalarModel)arg0).getAsString(); arg0String = ((TemplateScalarModel)arg0).getAsString();
} }
try
{
result = createQName(arg0String).toPrefixString(services.getNamespaceService()); result = createQName(arg0String).toPrefixString(services.getNamespaceService());
} }
catch (NamespaceException e)
{
// not valid qname -> return original value
result = arg0String;
}
}
return result != null ? result : ""; return result != null ? result : "";
} }