You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2018/03/14 16:27:24 UTC
lucene-solr:branch_7x: LUCENE-8200: Fix NPE in TestIndexWriter
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x db1360fac -> 7ea251a71
LUCENE-8200: Fix NPE in TestIndexWriter
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7ea251a7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7ea251a7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7ea251a7
Branch: refs/heads/branch_7x
Commit: 7ea251a717c185ae50287a56283724ae0a649182
Parents: db1360f
Author: Simon Willnauer <si...@apache.org>
Authored: Wed Mar 14 17:26:06 2018 +0100
Committer: Simon Willnauer <si...@apache.org>
Committed: Wed Mar 14 17:27:12 2018 +0100
----------------------------------------------------------------------
.../src/test/org/apache/lucene/index/TestIndexWriter.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7ea251a7/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index 9ea35c9..2e1864b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -3123,6 +3123,7 @@ public class TestIndexWriter extends LuceneTestCase {
oldReader = reader;
reader = DirectoryReader.openIfChanged(reader, writer);
assertNotSame(reader, oldReader);
+ assertNotNull(reader);
oldReader.close();
searcher = new IndexSearcher(reader);
topDocs = searcher.search(new TermQuery(new Term("id", "1")), 10);
@@ -3225,8 +3226,12 @@ public class TestIndexWriter extends LuceneTestCase {
writer.forceMerge(1);
DirectoryReader oldReader = reader;
reader = DirectoryReader.openIfChanged(reader, writer);
- assertNotSame(oldReader, reader);
- oldReader.close();
+ if (reader != null) {
+ oldReader.close();
+ assertNotSame(oldReader, reader);
+ } else {
+ reader = oldReader;
+ }
for (String id : ids) {
if (updateSeveralDocs) {
assertEquals(2, reader.docFreq(new Term("id", id)));