svn commit: r1060846 - in /lucene/dev/trunk: modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java

[yo...@apache.org]

Author: yonik
Date: Wed Jan 19 16:11:42 2011
New Revision: 1060846

URL: http://svn.apache.org/viewvc?rev=1060846&view=rev
Log:
SOLR-2316: fail early if synonym file not provided

Modified:
    lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java

Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java?rev=1060846&r1=1060845&r2=1060846&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java Wed Jan 19 16:11:42 2011
@@ -46,6 +46,9 @@ public final class SynonymFilter extends
 
   public SynonymFilter(TokenStream in, SynonymMap map) {
     super(in);
+    if (map == null)
+      throw new IllegalArgumentException("map is required");
+
     this.map = map;
     // just ensuring these attributes exist...
     addAttribute(CharTermAttribute.class);

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java?rev=1060846&r1=1060845&r2=1060846&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java Wed Jan 19 16:11:42 2011
@@ -22,6 +22,7 @@ import org.apache.lucene.analysis.synony
 import org.apache.lucene.analysis.synonym.SynonymMap;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.solr.common.ResourceLoader;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.util.plugin.ResourceLoaderAware;
 
@@ -40,7 +41,8 @@ public class SynonymFilterFactory extend
 
   public void inform(ResourceLoader loader) {
     String synonyms = args.get("synonyms");
-
+    if (synonyms == null)
+      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Missing required argument 'synonyms'.");
     boolean ignoreCase = getBoolean("ignoreCase", false);
     boolean expand = getBoolean("expand", true);
 
@@ -50,26 +52,24 @@ public class SynonymFilterFactory extend
       tokFactory = loadTokenizerFactory( loader, tf, args );
     }
 
-    if (synonyms != null) {
-      List<String> wlist=null;
-      try {
-        File synonymFile = new File(synonyms);
-        if (synonymFile.exists()) {
-          wlist = loader.getLines(synonyms);
-        } else  {
-          List<String> files = StrUtils.splitFileNames(synonyms);
-          wlist = new ArrayList<String>();
-          for (String file : files) {
-            List<String> lines = loader.getLines(file.trim());
-            wlist.addAll(lines);
-          }
+    List<String> wlist=null;
+    try {
+      File synonymFile = new File(synonyms);
+      if (synonymFile.exists()) {
+        wlist = loader.getLines(synonyms);
+      } else  {
+        List<String> files = StrUtils.splitFileNames(synonyms);
+        wlist = new ArrayList<String>();
+        for (String file : files) {
+          List<String> lines = loader.getLines(file.trim());
+          wlist.addAll(lines);
         }
-      } catch (IOException e) {
-        throw new RuntimeException(e);
       }
-      synMap = new SynonymMap(ignoreCase);
-      parseRules(wlist, synMap, "=>", ",", expand,tokFactory);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+    synMap = new SynonymMap(ignoreCase);
+    parseRules(wlist, synMap, "=>", ",", expand,tokFactory);
   }
 
   private SynonymMap synMap;