Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 91480 invoked from network); 25 Aug 2008 10:02:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Aug 2008 10:02:38 -0000 Received: (qmail 82824 invoked by uid 500); 25 Aug 2008 10:02:36 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 82798 invoked by uid 500); 25 Aug 2008 10:02:36 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 82789 invoked by uid 99); 25 Aug 2008 10:02:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2008 03:02:36 -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; Mon, 25 Aug 2008 10:01:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 10B36238896C; Mon, 25 Aug 2008 03:02:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688689 - in /lucene/java/trunk/src: java/org/apache/lucene/search/PhraseQuery.java test/org/apache/lucene/search/TestPhraseQuery.java Date: Mon, 25 Aug 2008 10:02:16 -0000 To: java-commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080825100217.10B36238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Mon Aug 25 03:02:16 2008 New Revision: 688689 URL: http://svn.apache.org/viewvc?rev=688689&view=rev Log: LUCENE-1280: prevent NPE in PhraseQuery.toString() when the PhraseQuery is empty Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQuery.java?rev=688689&r1=688688&r2=688689&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQuery.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQuery.java Mon Aug 25 03:02:16 2008 @@ -256,7 +256,7 @@ /** Prints a user-readable version of this query. */ public String toString(String f) { StringBuffer buffer = new StringBuffer(); - if (!field.equals(f)) { + if (field != null && !field.equals(f)) { buffer.append(field); buffer.append(":"); } Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=688689&r1=688688&r2=688689&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java Mon Aug 25 03:02:16 2008 @@ -544,5 +544,13 @@ //assertTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH