Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 63625 invoked from network); 13 May 2008 15:33:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 May 2008 15:33:03 -0000 Received: (qmail 29702 invoked by uid 500); 13 May 2008 15:33:04 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 29675 invoked by uid 500); 13 May 2008 15:33:04 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 29666 invoked by uid 99); 13 May 2008 15:33:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 May 2008 08:33:04 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 May 2008 15:32:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B6FBC2388A0D; Tue, 13 May 2008 08:32:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655917 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene: JQOM2LuceneQueryBuilder.java LuceneQueryBuilder.java Date: Tue, 13 May 2008 15:32:33 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080513153233.B6FBC2388A0D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue May 13 08:32:33 2008 New Revision: 655917 URL: http://svn.apache.org/viewvc?rev=655917&view=rev Log: JCR-1599: LuceneQueryBuilder assumes readability of root-Node to be granted in any case Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=655917&r1=655916&r2=655917&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Tue May 13 08:32:33 2008 @@ -20,9 +20,9 @@ import org.apache.jackrabbit.core.query.lucene.fulltext.QueryParser; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.HierarchyManager; -import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.HierarchyManagerImpl; +import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; @@ -229,9 +229,8 @@ IndexFormatVersion version) throws RepositoryException { - NodeId id = ((NodeImpl) session.getRootNode()).getNodeId(); HierarchyManager hmgr = new HierarchyManagerImpl( - id, sharedItemMgr, session); + RepositoryImpl.ROOT_NODE_ID, sharedItemMgr, session); JQOM2LuceneQueryBuilder builder = new JQOM2LuceneQueryBuilder( qomTree, session, sharedItemMgr, hmgr, nsMappings, analyzer, propReg, synonymProvider, bindVariableValues, version); Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=655917&r1=655916&r2=655917&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Tue May 13 08:32:33 2008 @@ -19,9 +19,9 @@ import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.HierarchyManagerImpl; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.SearchManager; import org.apache.jackrabbit.core.SessionImpl; +import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.query.PropertyTypeRegistry; import org.apache.jackrabbit.core.query.lucene.fulltext.ParseException; import org.apache.jackrabbit.core.query.lucene.fulltext.QueryParser; @@ -209,9 +209,8 @@ IndexFormatVersion indexFormatVersion) throws RepositoryException { - NodeId id = ((NodeImpl) session.getRootNode()).getNodeId(); HierarchyManager hmgr = new HierarchyManagerImpl( - id, sharedItemMgr, session); + RepositoryImpl.ROOT_NODE_ID, sharedItemMgr, session); LuceneQueryBuilder builder = new LuceneQueryBuilder( root, session, sharedItemMgr, hmgr, nsMappings, analyzer, propReg, synonymProvider, indexFormatVersion);