svn commit: r1502507 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java

[ro...@apache.org]

Author: romseygeek
Date: Fri Jul 12 10:50:31 2013
New Revision: 1502507

URL: http://svn.apache.org/r1502507
Log:
SOLR-4914: Close input streams as well

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java?rev=1502507&r1=1502506&r2=1502507&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java Fri Jul 12 10:50:31 2013
@@ -82,8 +82,7 @@ public class CorePropertiesLocator imple
       logger.error("Couldn't persist core properties to {}: {}", propfile.getAbsolutePath(), e);
     }
     finally {
-      if (os != null)
-        IOUtils.closeQuietly(os);
+      IOUtils.closeQuietly(os);
     }
   }
 
@@ -130,16 +129,22 @@ public class CorePropertiesLocator imple
   }
 
   protected CoreDescriptor buildCoreDescriptor(File propertiesFile, CoreContainer cc) {
+    FileInputStream fis = null;
     try {
       File instanceDir = propertiesFile.getParentFile();
       Properties coreProperties = new Properties();
-      coreProperties.load(new FileInputStream(propertiesFile));
+      fis = new FileInputStream(propertiesFile);
+      coreProperties.load(fis);
       String name = createName(coreProperties, instanceDir);
       return new CoreDescriptor(cc, name, instanceDir.getAbsolutePath(), coreProperties);
-    } catch (IOException e) {
+    }
+    catch (IOException e) {
       logger.error("Couldn't load core descriptor from {}:{}", propertiesFile.getAbsolutePath(), e.toString());
       return null;
     }
+    finally {
+      IOUtils.closeQuietly(fis);
+    }
   }
 
   protected static String createName(Properties p, File instanceDir) {