You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/09/08 07:23:02 UTC

svn commit: r1623273 - in /pig/trunk: CHANGES.txt src/org/apache/pig/tools/pigstats/ScriptState.java

Author: daijy
Date: Mon Sep  8 05:23:01 2014
New Revision: 1623273

URL: http://svn.apache.org/r1623273
Log:
PIG-4154: ScriptState#setScript(File) does not close resources

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/tools/pigstats/ScriptState.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1623273&r1=1623272&r2=1623273&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Sep  8 05:23:01 2014
@@ -70,6 +70,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4154: ScriptState#setScript(File) does not close resources (lars_francke via daijy)
+
 PIG-4155: Quitting grunt shell using CTRL-D character throws exception (abhishek.agarwal via daijy)
 
 PIG-4157: Pig compilation failure due to HIVE-7208 (daijy)

Modified: pig/trunk/src/org/apache/pig/tools/pigstats/ScriptState.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/tools/pigstats/ScriptState.java?rev=1623273&r1=1623272&r2=1623273&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/tools/pigstats/ScriptState.java (original)
+++ pig/trunk/src/org/apache/pig/tools/pigstats/ScriptState.java Mon Sep  8 05:23:01 2014
@@ -273,10 +273,19 @@ public abstract class ScriptState {
     }
 
     public void setScript(File file) {
+        BufferedReader reader = null;
         try {
-            setScript(new BufferedReader(new FileReader(file)));
+            reader = new BufferedReader(new FileReader(file));
+            setScript(reader);
         } catch (FileNotFoundException e) {
             LOG.warn("unable to find the file", e);
+        } finally {
+            if (reader != null) {
+              try {
+                  reader.close();
+              } catch (IOException ignored) {
+              }
+            }
         }
     }