svn commit: r1534477 - /lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java

[rm...@apache.org]

Author: rmuir
Date: Tue Oct 22 03:49:53 2013
New Revision: 1534477

URL: http://svn.apache.org/r1534477
Log:
LUCENE-4956: don't captureState unless we have to

Modified:
    lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java

Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java?rev=1534477&r1=1534476&r2=1534477&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/KoreanFilter.java Tue Oct 22 03:49:53 2013
@@ -101,17 +101,14 @@ public final class KoreanFilter extends 
     while (input.incrementToken()) {
       final String type = typeAtt.type();
       if (KOREAN_TYPE.equals(type)) {
-        currentState = captureState();
         analysisKorean(termAtt.toString());
       } else if (CHINESE_TYPE.equals(type)) {
-        currentState = captureState();
         analysisChinese(termAtt.toString());
       } else {
         return true; // pass anything else thru
       }        
   
       if (!morphQueue.isEmpty()) {
-        // no need to restore state!
         setAttributesFromQueue(true);
         return true;
       }
@@ -123,6 +120,11 @@ public final class KoreanFilter extends 
 
   private void setAttributesFromQueue(boolean isFirst) {
     final Token iw = morphQueue.removeFirst();
+    if (isFirst && !morphQueue.isEmpty()) {
+      // our queue has more elements remaining (e.g. we decompounded)
+      // capture state for those.
+      currentState = captureState();
+    }
     
     termAtt.setEmpty().append(iw.word);
     offsetAtt.setOffset(iw.offset, iw.offset + iw.word.length());