Index: src/java/org/apache/lucene/analysis/TokenStream.java
===================================================================
--- src/java/org/apache/lucene/analysis/TokenStream.java	(revision 816218)
+++ src/java/org/apache/lucene/analysis/TokenStream.java	(working copy)
@@ -400,10 +400,10 @@
       return incrementToken() ? ((Token) tokenWrapper.delegate.clone()) : null;
     } else {
       assert supportedMethods.hasReusableNext;
-      final Token token = next(tokenWrapper.delegate);
+      final Token token = next((Token) tokenWrapper.delegate.clone());
       if (token == null) return null;
       tokenWrapper.delegate = token;
-      return (Token) token.clone();
+      return token;
     }
   }