svn commit: r1291826 - in /lucene/dev/trunk/modules/suggest/src: java/org/apache/lucene/search/spell/HighFrequencyDictionary.java test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java

[rm...@apache.org]

Author: rmuir
Date: Tue Feb 21 14:56:42 2012
New Revision: 1291826

URL: http://svn.apache.org/viewvc?rev=1291826&view=rev
Log:
LUCENE-3807: fix missing null check in HighFrequencyDictionary

Added:
    lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java   (with props)
Modified:
    lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java

Modified: lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java?rev=1291826&r1=1291825&r2=1291826&view=diff
==============================================================================
--- lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java (original)
+++ lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java Tue Feb 21 14:56:42 2012
@@ -105,7 +105,11 @@ public class HighFrequencyDictionary imp
     @Override
     public Comparator<BytesRef> comparator() {
       try {
-        return termsEnum.getComparator();
+        if (termsEnum == null) {
+          return null;
+        } else {
+          return termsEnum.getComparator();
+        }
       } catch (IOException e) {
         throw new RuntimeException(e);
       }

Added: lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java?rev=1291826&view=auto
==============================================================================
--- lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java (added)
+++ lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java Tue Feb 21 14:56:42 2012
@@ -0,0 +1,42 @@
+package org.apache.lucene.search.suggest;
+
+/**
+ * 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.
+ */
+
+import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.search.spell.Dictionary;
+import org.apache.lucene.search.spell.HighFrequencyDictionary;
+import org.apache.lucene.search.spell.SortedIterator;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.LuceneTestCase;
+
+public class TestHighFrequencyDictionary extends LuceneTestCase {
+  public void testEmpty() throws Exception {
+    Directory dir = newDirectory();
+    IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+    writer.commit();
+    writer.close();
+    IndexReader ir = DirectoryReader.open(dir);
+    Dictionary dictionary = new HighFrequencyDictionary(ir, "bogus", 0.1f);
+    SortedIterator tf = (SortedIterator)dictionary.getWordsIterator();
+    tf.comparator();
+    dir.close();
+  }
+}