Author: pmouawad
Date: Tue Mar 1 12:29:41 2016
New Revision: 1733053
URL: http://svn.apache.org/viewvc?rev=1733053&view=rev
Log:
Bug 59085 - Http file panel : data lost on browse cancellation
Contributed by Benoit Wiart
#resolve #144
Bugzilla Id: 59085
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java?rev=1733053&r1=1733052&r2=1733053&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java Tue Mar
1 12:29:41 2016
@@ -111,7 +111,6 @@ public final class FileDialoger {
* finished using it - null if no file was chosen
*/
public static JFileChooser promptToOpenFile(String[] exts, String
existingFileName) {
- // JFileChooser jfc = null;
if(!StringUtils.isEmpty(existingFileName)) {
File existingFileStart = new File(existingFileName);
if(existingFileStart.exists() && existingFileStart.canRead()) {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1733053&r1=1733052&r2=1733053&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
Tue Mar 1 12:29:41 2016
@@ -37,6 +37,7 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableCellEditor;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.gui.util.FileDialoger;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
@@ -284,7 +285,9 @@ public class HTTPFileArgsPanel extends J
tableModel.removeRow(rowSelected);
} else if (BROWSE.equals(command)) {
String path = browseAndGetFilePath();
- tableModel.setValueAt(path, rowSelected, 0);
+ if(StringUtils.isNotBlank(path)) {
+ tableModel.setValueAt(path, rowSelected, 0);
+ }
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1733053&r1=1733052&r2=1733053&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Mar 1 12:29:41 2016
@@ -286,6 +286,7 @@ Summary
<li><bug>58881</bug>HTTP Request : HTTPHC4Impl shows exception when server
uses "deflate" compression</li>
<li><bug>58583</bug>HTTP client fails to close connection if server
misbehaves by not sending "connection: close", violating HTTP RFC 2616 / RFC
7230</li>
<li><bug>58950</bug>NoHttpResponseException when Pause between samplers
exceeds keepalive sent by server</li>
+ <li><bug>59085</bug>Http file panel : data lost on browse cancellation.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
</ul>
<h3>Other Samplers</h3>
