You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2018/01/09 13:46:23 UTC

lucene-solr:branch_7x: LUCENE-8075: Removed unnecessary null check in core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x bf8de4636 -> 0bf758b08


LUCENE-8075: Removed unnecessary null check in core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java.

Closes #286

Signed-off-by: Adrien Grand <jp...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0bf758b0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0bf758b0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0bf758b0

Branch: refs/heads/branch_7x
Commit: 0bf758b086896b20b4bad7cf875e5a4d441515e5
Parents: bf8de46
Author: Pulak Ghosh <gh...@gmail.com>
Authored: Wed Dec 6 12:17:05 2017 +0530
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Jan 9 14:42:47 2018 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                                            | 3 +++
 .../apache/lucene/codecs/blocktree/IntersectTermsEnum.java    | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bf758b0/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c99ddd6..ed66ff4 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -59,6 +59,9 @@ Other
 * LUCENE-8106: Add script (reproduceJenkinsFailures.py) to attempt to reproduce
   failing tests from a Jenkins log. (Steve Rowe)
 
+* LUCENE-8075: Removed unnecessary null check in IntersectTermsEnum.
+  (Pulak Ghosh via Adrien Grand)
+
 ======================= Lucene 7.2.0 =======================
 
 API Changes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bf758b0/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
index 19e56a4..7521763 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
@@ -103,11 +103,8 @@ final class IntersectTermsEnum extends TermsEnum {
       arcs[arcIdx] = new FST.Arc<>();
     }
 
-    if (fr.index == null) {
-      fstReader = null;
-    } else {
-      fstReader = fr.index.getBytesReader();
-    }
+    
+    fstReader = fr.index.getBytesReader();
 
     // TODO: if the automaton is "smallish" we really
     // should use the terms index to seek at least to