From 44fc56dc9209a0003f06a9a9f32553c50c1fd812 Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Thu, 24 Nov 2011 10:11:06 +0000
Subject: [PATCH] SOLR-2912 -- Fixed File descriptor leak in
 ShowFileRequestHandler

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1205774 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                                           | 4 ++++
 .../apache/solr/handler/admin/ShowFileRequestHandler.java  | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ef3068ae005..c0906688f9b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
index d2e76ddf607..4869483927a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
@@ -206,11 +206,14 @@ public class ShowFileRequestHandler extends RequestHandlerBase
         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 "";
   }