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 2011/11/24 11:11:07 UTC
svn commit: r1205774 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
Author: shalin
Date: Thu Nov 24 10:11:06 2011
New Revision: 1205774
URL: http://svn.apache.org/viewvc?rev=1205774&view=rev
Log:
SOLR-2912 -- Fixed File descriptor leak in ShowFileRequestHandler
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1205774&r1=1205773&r2=1205774&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Nov 24 10:11:06 2011
@@ -383,6 +383,10 @@ New Features
* SOLR-1565: StreamingUpdateSolrServer supports RequestWriter API and therefore, javabin update
format (shalin)
+Bug Fixes
+----------------------
+* SOLR-2912: Fixed File descriptor leak in ShowFileRequestHandler (Michael Ryan, shalin)
+
================== 3.5.0 ==================
New Features
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1205774&r1=1205773&r2=1205774&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Thu Nov 24 10:11:06 2011
@@ -206,11 +206,14 @@ public class ShowFileRequestHandler exte
return ""; // ignore it...
}
}
+ InputStream input = null;
try {
- InputStream input = core.getResourceLoader().openResource(path);
+ input = core.getResourceLoader().openResource(path);
return IOUtils.toString( input, "UTF-8" );
+ } catch( Exception ex ) {
+ } finally {
+ IOUtils.closeQuietly(input);
}
- catch( Exception ex ) {} // ignore it
return "";
}