Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 12871 invoked from network); 3 Dec 2008 14:16:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Dec 2008 14:16:14 -0000 Received: (qmail 29653 invoked by uid 500); 3 Dec 2008 14:16:26 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 29562 invoked by uid 500); 3 Dec 2008 14:16:25 -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 29553 invoked by uid 99); 3 Dec 2008 14:16:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 06:16:25 -0800 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; Wed, 03 Dec 2008 14:15:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 233D52388975; Wed, 3 Dec 2008 06:15:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r722897 - /lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Date: Wed, 03 Dec 2008 14:15:22 -0000 To: java-commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081203141523.233D52388975@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Wed Dec 3 06:15:22 2008 New Revision: 722897 URL: http://svn.apache.org/viewvc?rev=722897&view=rev Log: LUCENE-1246: check for null sub queries so that BooleanQuery.toString does not throw NullPointerException. Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java?rev=722897&r1=722896&r2=722897&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Wed Dec 3 06:15:22 2008 @@ -424,12 +424,17 @@ buffer.append("+"); Query subQuery = c.getQuery(); - if (subQuery instanceof BooleanQuery) { // wrap sub-bools in parens - buffer.append("("); - buffer.append(c.getQuery().toString(field)); - buffer.append(")"); - } else - buffer.append(c.getQuery().toString(field)); + if (subQuery != null) { + if (subQuery instanceof BooleanQuery) { // wrap sub-bools in parens + buffer.append("("); + buffer.append(subQuery.toString(field)); + buffer.append(")"); + } else { + buffer.append(subQuery.toString(field)); + } + } else { + buffer.append("null"); + } if (i != clauses.size()-1) buffer.append(" ");