svn commit: r758137 - in /lucene/solr/trunk/src/java/org/apache/solr/analysis: CharStreamAwareCJKTokenizerFactory.java CharStreamAwareWhitespaceTokenizerFactory.java

[koji]

Author: koji
Date: Wed Mar 25 03:34:34 2009
New Revision: 758137

URL: http://svn.apache.org/viewvc?rev=758137&view=rev
Log:
SOLR-822: avoid ClassCastException when CharStreamAware*TokenizerFactory is 
used without CharFilter

Modified:
    
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareCJKTokenizerFactory.java
    
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareWhitespaceTokenizerFactory.java

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareCJKTokenizerFactory.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareCJKTokenizerFactory.java?rev=758137&r1=758136&r2=758137&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareCJKTokenizerFactory.java
 (original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareCJKTokenizerFactory.java
 Wed Mar 25 03:34:34 2009
@@ -30,6 +30,10 @@
 public class CharStreamAwareCJKTokenizerFactory extends BaseTokenizerFactory {
 
   public CharStreamAwareCJKTokenizer create(Reader input) {
-    return new CharStreamAwareCJKTokenizer( (CharStream)input );
+    return new CharStreamAwareCJKTokenizer(
+      input instanceof CharStream ?
+        (CharStream)input :
+        new CharReader(input)
+    );
   }
 }

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareWhitespaceTokenizerFactory.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareWhitespaceTokenizerFactory.java?rev=758137&r1=758136&r2=758137&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareWhitespaceTokenizerFactory.java
 (original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/analysis/CharStreamAwareWhitespaceTokenizerFactory.java
 Wed Mar 25 03:34:34 2009
@@ -30,6 +30,10 @@
 public class CharStreamAwareWhitespaceTokenizerFactory extends 
BaseTokenizerFactory {
 
   public CharStreamAwareWhitespaceTokenizer create(Reader input) {
-    return new CharStreamAwareWhitespaceTokenizer( (CharStream)input );
+    return new CharStreamAwareWhitespaceTokenizer(
+      input instanceof CharStream ?
+        (CharStream)input :
+        new CharReader(input)
+      );
   }
 }