You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/04/06 06:53:01 UTC
svn commit: r1671482 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/RequestParams.java
Author: noble
Date: Mon Apr 6 04:53:01 2015
New Revision: 1671482
URL: http://svn.apache.org/r1671482
Log:
SOLR-7168: Close stream aftyer reading it
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestParams.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestParams.java?rev=1671482&r1=1671481&r2=1671482&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestParams.java Mon Apr 6 04:53:01 2015
@@ -21,10 +21,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
@@ -174,27 +177,23 @@ public class RequestParams implements Ma
private static Object[] getMapAndVersion(SolrResourceLoader loader, String name) {
- InputStream in = null;
- try {
- in = loader.openResource(name);
+ try (InputStream in = loader.openResource(name)) {
+ int version = 0; //will be always 0 for file based resourceloader
+ if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {
+ version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();
+ log.info("conf resource {} loaded . version : {} ", name, version);
+ }
+ try {
+ Map m = (Map) ObjectBuilder.getVal(new JSONParser(new InputStreamReader(in, StandardCharsets.UTF_8)));
+ return new Object[]{m, version};
+ } catch (IOException e) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error parsing conf resource " + name, e);
+ }
+
} catch (IOException e) {
//no problem no overlay.json file
return new Object[]{Collections.EMPTY_MAP, -1};
}
-
- int version = 0; //will be always 0 for file based resourceloader
- if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {
- version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();
- log.info("conf resource {} loaded . version : {} ", name, version);
- }
-
- try {
- Map m = (Map) ObjectBuilder.getVal(new JSONParser(new InputStreamReader(in, StandardCharsets.UTF_8)));
- return new Object[]{m, version};
- } catch (IOException e) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error parsing conf resource " + name, e);
- }
-
}