You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/04/04 16:27:19 UTC

[06/14] lucene-solr:jira/solr-9959: SOLR-10351: Add try-with-resources clause around TokenStream

SOLR-10351: Add try-with-resources clause around TokenStream


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e872dc79
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e872dc79
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e872dc79

Branch: refs/heads/jira/solr-9959
Commit: e872dc7913036c81b9ef48cf35c3456321b758b7
Parents: 65b4530
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Apr 3 20:39:37 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Apr 3 20:39:37 2017 -0400

----------------------------------------------------------------------
 .../org/apache/solr/handler/AnalyzeEvaluator.java  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e872dc79/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
index 207f404..485f9c3 100644
--- a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
+++ b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
@@ -81,17 +81,16 @@ public class AnalyzeEvaluator extends SimpleEvaluator {
       return null;
     }
 
-    TokenStream tokenStream = analyzer.tokenStream(analyzerField, value);
-    CharTermAttribute termAtt = tokenStream.getAttribute(CharTermAttribute.class);
-    tokenStream.reset();
     List<String> tokens = new ArrayList();
-    while (tokenStream.incrementToken()) {
-      tokens.add(termAtt.toString());
-    }
-
-    tokenStream.end();
-    tokenStream.close();
 
+    try(TokenStream tokenStream = analyzer.tokenStream(analyzerField, value)) {
+      CharTermAttribute termAtt = tokenStream.getAttribute(CharTermAttribute.class);
+      tokenStream.reset();
+      while (tokenStream.incrementToken()) {
+        tokens.add(termAtt.toString());
+      }
+      tokenStream.end();
+    }
     return tokens;
   }