You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/17 23:24:37 UTC
svn commit: r1783479 -
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Author: pmouawad
Date: Fri Feb 17 23:24:36 2017
New Revision: 1783479
URL: http://svn.apache.org/viewvc?rev=1783479&view=rev
Log:
Fix leak reported by sonar
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=1783479&r1=1783478&r2=1783479&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Fri Feb 17 23:24:36 2017
@@ -28,7 +28,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.gui.Replaceable;
@@ -137,9 +136,8 @@ public class HeaderManager extends Confi
throw new IOException("The file you specified cannot be read.");
}
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new FileReader(file)); // TODO Charset ?
+ try ( FileReader fr = new FileReader(file);
+ BufferedReader reader = new BufferedReader(fr) ) {
String line;
while ((line = reader.readLine()) != null) {
try {
@@ -155,8 +153,6 @@ public class HeaderManager extends Confi
throw new IOException("Error parsing header line\n\t'" + line + "'\n\t" + e);
}
}
- } finally {
- IOUtils.closeQuietly(reader);
}
}