Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 4873 invoked from network); 2 Dec 2010 17:53:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Dec 2010 17:53:37 -0000 Received: (qmail 32912 invoked by uid 500); 2 Dec 2010 17:53:37 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 32905 invoked by uid 99); 2 Dec 2010 17:53:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 17:53:37 +0000 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; Thu, 02 Dec 2010 17:53:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9163623888EA; Thu, 2 Dec 2010 17:52:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041497 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/ solr/src/java/org/apache/solr/search/FunctionQParser.java Date: Thu, 02 Dec 2010 17:52:05 -0000 To: commits@lucene.apache.org From: gsingers@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101202175205.9163623888EA@eris.apache.org> Author: gsingers Date: Thu Dec 2 17:52:05 2010 New Revision: 1041497 URL: http://svn.apache.org/viewvc?rev=1041497&view=rev Log: fix parsing of empty value source list [from revision 1002002] Modified: lucene/dev/branches/branch_3x/ (props changed) lucene/dev/branches/branch_3x/lucene/ (props changed) lucene/dev/branches/branch_3x/solr/ (props changed) lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java?rev=1041497&r1=1041496&r2=1041497&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java (original) +++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java Thu Dec 2 17:52:05 2010 @@ -214,9 +214,8 @@ public class FunctionQParser extends QPa */ public List parseValueSourceList() throws ParseException { List sources = new ArrayList(3); - for (;;) { - sources.add(parseValueSource(false)); - if (! consumeArgumentDelimiter()) break; + while (hasMoreArguments()) { + sources.add(parseValueSource(true)); } return sources; }