Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1280: prevent NPE in PhraseQuery.toString() when the PhraseQuery is empty 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@688689 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2008-08-25 10:02:16 +00:00
parent 3034575f66
commit 85102bd84a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/lucene/search/PhraseQuery.java
View File

@ -256,7 +256,7 @@ public class PhraseQuery extends Query {
/** Prints a user-readable version of this query. */ /** Prints a user-readable version of this query. */
public String toString(String f) { public String toString(String f) {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
if (!field.equals(f)) { if (field != null && !field.equals(f)) {
buffer.append(field); buffer.append(field);
buffer.append(":"); buffer.append(":");
} }

8
src/test/org/apache/lucene/search/TestPhraseQuery.java
View File

@ -544,5 +544,13 @@ public class TestPhraseQuery extends LuceneTestCase {
//assertTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3); //assertTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
//assertEquals("ordered or reversed does not matter",score2, score3, SCORE_COMP_THRESH); //assertEquals("ordered or reversed does not matter",score2, score3, SCORE_COMP_THRESH);
} }
// LUCENE-1280
public void testEmptyPhraseQuery() throws Throwable {
final PhraseQuery q1 = new PhraseQuery();
final BooleanQuery q2 = new BooleanQuery();
q2.add(new PhraseQuery(), BooleanClause.Occur.MUST);
q2.toString();
}
} }