Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 43951 invoked from network); 19 Nov 2007 11:32:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Nov 2007 11:32:37 -0000 Received: (qmail 11971 invoked by uid 500); 19 Nov 2007 11:32:25 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 11937 invoked by uid 500); 19 Nov 2007 11:32:24 -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 11928 invoked by uid 99); 19 Nov 2007 11:32:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2007 03:32:24 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2007 11:32:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AB6571A9832; Mon, 19 Nov 2007 03:32:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596274 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java Date: Mon, 19 Nov 2007 11:32:16 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071119113216.AB6571A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Mon Nov 19 03:32:09 2007 New Revision: 596274 URL: http://svn.apache.org/viewvc?rev=596274&view=rev Log: JCR-1214: DocId.UUIDDocId should not have a string attr uuid Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java?rev=596274&r1=596273&r2=596274&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java Mon Nov 19 03:32:09 2007 @@ -19,6 +19,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; +import org.apache.jackrabbit.uuid.UUID; import java.io.IOException; import java.util.BitSet; @@ -174,9 +175,9 @@ private static final class UUIDDocId extends DocId { /** - * The node uuid or null if not set. + * The node uuid. */ - private final String uuid; + private final UUID uuid; /** * The index reader that was used to calculate the document number. @@ -194,9 +195,11 @@ * Creates a DocId based on a Node uuid. * * @param uuid the Node uuid. + * @throws IllegalArgumentException if the uuid is + * malformed. */ UUIDDocId(String uuid) { - this.uuid = uuid; + this.uuid = UUID.fromString(uuid); } /** @@ -208,7 +211,7 @@ return docNumber; } } - Term id = new Term(FieldNames.UUID, uuid); + Term id = new Term(FieldNames.UUID, uuid.toString()); TermDocs docs = reader.termDocs(id); int doc = -1; try {