You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/01/23 13:28:19 UTC
[47/51] lucene-solr:jira/solr-11714: LUCENE-8130: fix NPE from
TermStates.toString
LUCENE-8130: fix NPE from TermStates.toString
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fc6f3a45
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fc6f3a45
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fc6f3a45
Branch: refs/heads/jira/solr-11714
Commit: fc6f3a45f8bdd1518ed49b68fbdc62988b34644b
Parents: 5425353
Author: Mike McCandless <mi...@apache.org>
Authored: Fri Jan 19 08:53:30 2018 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Fri Jan 19 08:53:30 2018 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 2 ++
.../org/apache/lucene/index/TermStates.java | 2 +-
.../org/apache/lucene/index/TestTermStates.java | 36 ++++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc6f3a45/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 038285e..6b90215 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -144,6 +144,8 @@ Bug Fixes
* LUCENE-8120: Fix LatLonBoundingBox's toString() method (Martijn van Groningen, Adrien Grand)
+* LUCENE-8130: Fix NullPointerException from TermStates.toString() (Mike McCandless)
+
Other
* LUCENE-8111: IndexOrDocValuesQuery Javadoc references outdated method name.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc6f3a45/lucene/core/src/java/org/apache/lucene/index/TermStates.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/TermStates.java b/lucene/core/src/java/org/apache/lucene/index/TermStates.java
index 3282ac8..4bb83fe 100644
--- a/lucene/core/src/java/org/apache/lucene/index/TermStates.java
+++ b/lucene/core/src/java/org/apache/lucene/index/TermStates.java
@@ -224,7 +224,7 @@ public final class TermStates {
sb.append("TermStates\n");
for(TermState termState : states) {
sb.append(" state=");
- sb.append(termState.toString());
+ sb.append(termState);
sb.append('\n');
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc6f3a45/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java
new file mode 100644
index 0000000..a89fe7b
--- /dev/null
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.lucene.index;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
+
+public class TestTermStates extends LuceneTestCase {
+
+ public void testToStringOnNullTermState() throws Exception {
+ Directory dir = newDirectory();
+ RandomIndexWriter w = new RandomIndexWriter(random(), dir);
+ w.addDocument(new Document());
+ IndexReader r = w.getReader();
+ TermStates states = TermStates.build(r.getContext(), new Term("foo", "bar"), random().nextBoolean());
+ assertEquals("TermStates\n state=null\n", states.toString());
+ IOUtils.close(r, w, dir);
+ }
+}