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

[05/15] lucene-solr:feature/autoscaling: 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/4dd785e5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4dd785e5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4dd785e5

Branch: refs/heads/feature/autoscaling
Commit: 4dd785e5efa7c45aeead2469a8a537e4c075e8f9
Parents: 5ee18c8
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Apr 3 20:39:37 2017 -0400
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Apr 4 14:30:30 2017 +0530

----------------------------------------------------------------------
 .../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/4dd785e5/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;
   }