From 60ea2805ccdbc703bdaf12cc6f3f470118c572e3 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 10 Sep 2007 15:08:10 +0000
Subject: [PATCH] Compilation fixes on clashes with tenant-related work

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../impl/lucene/ADMLuceneSearcherImpl.java    | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
index d5211a5eee..d3fc8d1814 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
@@ -304,7 +304,6 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
                 }
 
                 Path[] paths = searchParameters.getAttributePaths().toArray(new Path[0]);
-<<<<<<< .working
                 return new LuceneResultSet(
                         hits,
                         searcher,
@@ -312,10 +311,6 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
                         tenantService,
                         paths,
                         searchParameters);
-=======
-                return new LuceneResultSet(hits, searcher, nodeService, paths, searchParameters);
->>>>>>> .merge-right.r6367
-
             }
             catch (ParseException e)
             {
@@ -348,12 +343,13 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
                     return new EmptyResultSet();
                 }
                 Hits hits = searcher.search(query);
-<<<<<<< .working
-                return new LuceneResultSet(hits, searcher, nodeService, tenantService, searchParameters.getAttributePaths().toArray(
-                        new Path[0]), searchParameters);
-=======
-                return new LuceneResultSet(hits, searcher, nodeService, searchParameters.getAttributePaths().toArray(new Path[0]), searchParameters);
->>>>>>> .merge-right.r6367
+                return new LuceneResultSet(
+                        hits,
+                        searcher,
+                        nodeService,
+                        tenantService,
+                        searchParameters.getAttributePaths().toArray(new Path[0]),
+                        searchParameters);
             }
             catch (SAXPathException e)
             {
@@ -573,15 +569,10 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
             boolean followAllParentLinks, String language) throws InvalidNodeRefException, XPathException
     {
         NodeSearcher nodeSearcher = new NodeSearcher(nodeService, dictionaryService, this);
-<<<<<<< .working
         
         contextNodeRef = tenantService.getName(contextNodeRef);
         
-        return nodeSearcher.selectNodes(contextNodeRef, xpath, parameters, namespacePrefixResolver,
-                followAllParentLinks, language);
-=======
         return nodeSearcher.selectNodes(contextNodeRef, xpath, parameters, namespacePrefixResolver, followAllParentLinks, language);
->>>>>>> .merge-right.r6367
     }
 
     /**