Index: modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/Segmenter.java
===================================================================
--- modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/Segmenter.java	(revision 1240660)
+++ modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/Segmenter.java	(working copy)
@@ -22,7 +22,11 @@
 import java.util.EnumMap;
 import java.util.List;
 
-import org.apache.lucene.analysis.kuromoji.dict.*;
+import org.apache.lucene.analysis.kuromoji.dict.ConnectionCosts;
+import org.apache.lucene.analysis.kuromoji.dict.Dictionary;
+import org.apache.lucene.analysis.kuromoji.dict.TokenInfoDictionary;
+import org.apache.lucene.analysis.kuromoji.dict.UnknownDictionary;
+import org.apache.lucene.analysis.kuromoji.dict.UserDictionary;
 import org.apache.lucene.analysis.kuromoji.viterbi.GraphvizFormatter;
 import org.apache.lucene.analysis.kuromoji.viterbi.Viterbi;
 import org.apache.lucene.analysis.kuromoji.viterbi.ViterbiNode;
@@ -37,6 +41,8 @@
     NORMAL, SEARCH, EXTENDED
   }
   
+  public static final Mode DEFAULT_MODE = Mode.SEARCH;
+  
   private final Viterbi viterbi;
   
   private final EnumMap<Type, Dictionary> dictionaryMap = new EnumMap<Type, Dictionary>(Type.class);
@@ -44,31 +50,25 @@
   private final boolean split;
   
   public Segmenter() {
-    this(null, Mode.NORMAL, false);
+    this(null, DEFAULT_MODE, false);
   }
 
-  public Segmenter(UserDictionary userDictionary, Mode mode) {
-    this(userDictionary, mode, false);
+  public Segmenter(Mode mode) {
+    this(null, mode, false);
   }
 
   public Segmenter(UserDictionary userDictionary) {
-    this(userDictionary, Mode.NORMAL, false);
+    this(userDictionary, DEFAULT_MODE, false);
   }
 
-  public Segmenter(Mode mode) {
-    this(null, mode, false);
+  public Segmenter(UserDictionary userDictionary, Mode mode) {
+    this(userDictionary, mode, false);
   }
 
   public Segmenter(UserDictionary userDictionary, Mode mode, boolean split) {
-    
     final TokenInfoDictionary dict = TokenInfoDictionary.getInstance();
     final UnknownDictionary unknownDict = UnknownDictionary.getInstance();
-    this.viterbi = new Viterbi(dict,
-        unknownDict,
-        ConnectionCosts.getInstance(),
-        userDictionary,
-        mode);
-    
+    this.viterbi = new Viterbi(dict, unknownDict, ConnectionCosts.getInstance(), userDictionary, mode);
     this.split = split;
     
     dictionaryMap.put(Type.KNOWN, dict);
Index: solr/core/src/java/org/apache/solr/analysis/KuromojiTokenizerFactory.java
===================================================================
--- solr/core/src/java/org/apache/solr/analysis/KuromojiTokenizerFactory.java	(revision 1240660)
+++ solr/core/src/java/org/apache/solr/analysis/KuromojiTokenizerFactory.java	(working copy)
@@ -24,6 +24,7 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
 import java.util.Locale;
+import java.util.Map;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.kuromoji.KuromojiTokenizer;
@@ -62,7 +63,7 @@
   
   @Override
   public void inform(ResourceLoader loader) {
-    Mode mode = args.get(MODE) != null ? Mode.valueOf(args.get(MODE).toUpperCase(Locale.ENGLISH)) : Mode.NORMAL;
+    Mode mode = getMode(args);
     String userDictionaryPath = args.get(USER_DICT_PATH);
     try {
       if (userDictionaryPath != null) {
@@ -88,4 +89,13 @@
   public Tokenizer create(Reader input) {
     return new KuromojiTokenizer(segmenter, input);
   }
-}
\ No newline at end of file
+  
+  private Mode getMode(Map<String, String> args) {
+    String mode = args.get(MODE);
+    if (mode != null) {
+      return Mode.valueOf(mode.toUpperCase(Locale.ENGLISH));
+    } else {
+      return Segmenter.DEFAULT_MODE;
+    }
+  }
+}