From f8a6393af4522d14f21788dd6e4d6e53c5d1d723 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 27 Mar 2015 23:17:24 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 100471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 100280: Fix to correctly handle root node (null parent qname reference) in ChildAssocRefWrapper for Admin Console scripts. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/admin/NodeBrowserPost.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java b/source/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java index 1054a3c635..afd0c779b3 100644 --- a/source/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java +++ b/source/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java @@ -292,12 +292,14 @@ public class NodeBrowserPost extends NodeBrowserScript implements Serializable public String getTypeQName() { - return typeqname != null ? typeqname : (typeqname = ref.getTypeQName().toPrefixString(getNamespaceService())); + return typeqname != null ? typeqname : ( + typeqname = ref.getTypeQName() != null ? ref.getTypeQName().toPrefixString(getNamespaceService()) : ""); } public String getQName() { - return qname != null ? qname : (qname = ref.getQName().toPrefixString(getNamespaceService())); + return qname != null ? qname : ( + qname = ref.getQName() != null ? ref.getQName().toPrefixString(getNamespaceService()) : ""); } public NodeRef getChildRef()