svn commit: r1783596 - /jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Feb 18 21:43:14 2017
New Revision: 1783596

URL: http://svn.apache.org/viewvc?rev=1783596&view=rev
Log:
Fix sonar errors on unclosed streams

Modified:
    jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=1783596&r1=1783595&r2=1783596&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java Sat Feb 18 21:43:14 2017
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -96,6 +97,9 @@ public class StringFromFile extends Abst
     private Object[] values;
 
     // @GuardedBy("this")
+    private FileReader myFileReader = null; // File reader
+
+    // @GuardedBy("this")
     private BufferedReader myBread = null; // Buffered reader
 
     // @GuardedBy("this")
@@ -133,6 +137,12 @@ public class StringFromFile extends Abst
         } catch (IOException e) {
             log.error("closeFile() error: " + e.toString(), e);//$NON-NLS-1$
         }
+        
+        try {
+            myFileReader.close();
+        } catch (IOException e) {
+            log.error("closeFile() error: " + e.toString(), e);//$NON-NLS-1$
+        }
     }
     
     private synchronized void openFile() {
@@ -198,10 +208,14 @@ public class StringFromFile extends Abst
 
         log.info(tn + " opening file " + fileName);//$NON-NLS-1$
         try {
-            myBread = new BufferedReader(new FileReader(fileName));
+            myFileReader = new FileReader(fileName);
+            myBread = new BufferedReader(myFileReader);
         } catch (Exception e) {
             log.error("openFile() error: " + e.toString());//$NON-NLS-1$
+            IOUtils.closeQuietly(myFileReader);
+            IOUtils.closeQuietly(myBread);
             myBread = null;
+            myFileReader = null;
         }
     }