You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/08 11:36:41 UTC

svn commit: r1228820 - in /lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict: TokenInfoDictionary.java TokenInfoFST.java

Author: uschindler
Date: Sun Jan  8 10:36:40 2012
New Revision: 1228820

URL: http://svn.apache.org/viewvc?rev=1228820&view=rev
Log:
LUCENE-3305: Catching IOEx and rethrowing as RuntimeEx in TokenInfoDictionary ctor is not needed as ctor already throws IOEx. Made FST final.

Modified:
    lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java
    lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoFST.java

Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java?rev=1228820&r1=1228819&r2=1228820&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java Sun Jan  8 10:36:40 2012
@@ -34,6 +34,7 @@ public final class TokenInfoDictionary e
   
   private TokenInfoDictionary() throws IOException {
     super();
+    IOException priorE = null;
     InputStream is = null;
     FST<Long> fst = null;
     try {
@@ -42,9 +43,9 @@ public final class TokenInfoDictionary e
         throw new FileNotFoundException("Not in classpath: " + getClass().getName().replace('.','/') + FST_FILENAME_SUFFIX);
       fst = new FST<Long>(new InputStreamDataInput(is), PositiveIntOutputs.getSingleton(true));
     } catch (IOException ioe) {
-      throw new RuntimeException("Cannot load FST.", ioe);
+      priorE = ioe;
     } finally {
-      IOUtils.closeWhileHandlingException(is);
+      IOUtils.closeWhileHandlingException(priorE, is);
     }
     // TODO: some way to configure?
     this.fst = new TokenInfoFST(fst, true);

Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoFST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoFST.java?rev=1228820&r1=1228819&r2=1228820&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoFST.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoFST.java Sun Jan  8 10:36:40 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.apache.lucene.util.fst.FST;
 import org.apache.lucene.util.fst.FST.Arc;
 
-public class TokenInfoFST {
+public final class TokenInfoFST {
   private final FST<Long> fst;
 
   // depending upon fasterButMoreRam, we cache root arcs for either