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:26:40 UTC
lucene-solr:master: LUCENE-8200: Fix NPE in TestIndexWriter
Repository: lucene-solr
Updated Branches:
refs/heads/master 446d38474 -> b7793372a
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/b7793372
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b7793372
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b7793372
Branch: refs/heads/master
Commit: b7793372a937395d393af17e2461bab4cecd94e0
Parents: 446d384
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:26:06 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/b7793372/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 814d816..3f4c87f 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -3100,6 +3100,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);
@@ -3202,8 +3203,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)));