You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2018/04/04 08:55:26 UTC
[1/2] lucene-solr:master: LUCENE-8196: Check for a null input in
LowpassIntervalsSource
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 3c68f3d63 -> 7fcaac855
refs/heads/master 34b83ed86 -> 7117b68db
LUCENE-8196: Check for a null input in LowpassIntervalsSource
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7117b68d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7117b68d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7117b68d
Branch: refs/heads/master
Commit: 7117b68db6835acfeda17f04ab2c20a8c1ec2c17
Parents: 34b83ed
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Apr 4 09:37:32 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Apr 4 09:38:19 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/lucene/search/intervals/IntervalFilter.java | 3 ++-
.../apache/lucene/search/intervals/LowpassIntervalsSource.java | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7117b68d/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
index d1d2fcf..7571fc2 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
@@ -18,6 +18,7 @@
package org.apache.lucene.search.intervals;
import java.io.IOException;
+import java.util.Objects;
/**
* Wraps an {@link IntervalIterator} and passes through those intervals that match the {@link #accept()} function
@@ -30,7 +31,7 @@ public abstract class IntervalFilter extends IntervalIterator {
* Create a new filter
*/
public IntervalFilter(IntervalIterator in) {
- this.in = in;
+ this.in = Objects.requireNonNull(in);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7117b68d/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
index 3bb469e..4d7846c 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
@@ -56,6 +56,9 @@ class LowpassIntervalsSource extends IntervalsSource {
@Override
public IntervalIterator intervals(String field, LeafReaderContext ctx) throws IOException {
IntervalIterator i = in.intervals(field, ctx);
+ if (i == null) {
+ return null;
+ }
return new IntervalFilter(i) {
@Override
protected boolean accept() {
[2/2] lucene-solr:branch_7x: LUCENE-8196: Check for a null input in
LowpassIntervalsSource
Posted by ro...@apache.org.
LUCENE-8196: Check for a null input in LowpassIntervalsSource
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7fcaac85
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7fcaac85
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7fcaac85
Branch: refs/heads/branch_7x
Commit: 7fcaac8550e340512c09a8d8f4bd4773096f63f3
Parents: 3c68f3d
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Apr 4 09:37:32 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Apr 4 09:38:39 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/lucene/search/intervals/IntervalFilter.java | 3 ++-
.../apache/lucene/search/intervals/LowpassIntervalsSource.java | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7fcaac85/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
index d1d2fcf..7571fc2 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java
@@ -18,6 +18,7 @@
package org.apache.lucene.search.intervals;
import java.io.IOException;
+import java.util.Objects;
/**
* Wraps an {@link IntervalIterator} and passes through those intervals that match the {@link #accept()} function
@@ -30,7 +31,7 @@ public abstract class IntervalFilter extends IntervalIterator {
* Create a new filter
*/
public IntervalFilter(IntervalIterator in) {
- this.in = in;
+ this.in = Objects.requireNonNull(in);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7fcaac85/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
index 3bb469e..4d7846c 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/LowpassIntervalsSource.java
@@ -56,6 +56,9 @@ class LowpassIntervalsSource extends IntervalsSource {
@Override
public IntervalIterator intervals(String field, LeafReaderContext ctx) throws IOException {
IntervalIterator i = in.intervals(field, ctx);
+ if (i == null) {
+ return null;
+ }
return new IntervalFilter(i) {
@Override
protected boolean accept() {