From e7048ebcb3fb120fd4b1ce4ef28dcfb656d8f80a Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 20 Oct 2011 16:40:13 +0000
Subject: [PATCH] Fixed ALF-10962.  It is not an error for a QName to be
 missing.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31390 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../GetAuthoritiesCannedQueryFactory.java     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
index 2fd3d4ed9f..ad4b6bab35 100644
--- a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
+++ b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
@@ -21,7 +21,6 @@ package org.alfresco.repo.security.authority;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.query.AbstractCannedQueryFactory;
 import org.alfresco.query.CannedQuery;
@@ -103,10 +102,17 @@ public class GetAuthoritiesCannedQueryFactory extends AbstractCannedQueryFactory
         
         Long containerNodeId = nodePair.getFirst();
         
+        Long qnameAuthDisplayNameId = Long.MIN_VALUE;           // We query but using a value that won't return results
+        Pair<Long, QName> qnameAuthDisplayNamePair = qnameDAO.getQName(ContentModel.PROP_AUTHORITY_DISPLAY_NAME);
+        if (qnameAuthDisplayNamePair != null)
+        {
+            qnameAuthDisplayNameId = qnameAuthDisplayNamePair.getFirst();
+        }
+        
         // specific query params
         GetAuthoritiesCannedQueryParams paramBean = new GetAuthoritiesCannedQueryParams(type,
                                                                                         containerNodeId,
-                                                                                        getQNameId(ContentModel.PROP_AUTHORITY_DISPLAY_NAME),
+                                                                                        qnameAuthDisplayNameId,
                                                                                         displayNameFilter);
         
         // page details
@@ -128,16 +134,6 @@ public class GetAuthoritiesCannedQueryFactory extends AbstractCannedQueryFactory
         return getCannedQuery(params);
     }
     
-    private Long getQNameId(QName qname)
-    {
-        Pair<Long, QName> qnamePair = qnameDAO.getQName(qname);
-        if (qnamePair == null)
-        {
-            throw new AlfrescoRuntimeException("QName does not exist: " + qname);
-        }
-        return qnamePair.getFirst();
-    }
-    
     @Override
     public void afterPropertiesSet() throws Exception
     {