jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1509896 - in /jmeter/trunk: src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java xdocs/changes.xml
Date Fri, 02 Aug 2013 22:32:57 GMT
Author: sebb
Date: Fri Aug  2 22:32:57 2013
New Revision: 1509896

URL: http://svn.apache.org/r1509896
Log:
NativeCommand hangs if no input file is specified and the application requests input
Bugzilla Id: 55349

Modified:
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java?rev=1509896&r1=1509895&r2=1509896&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
(original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
Fri Aug  2 22:32:57 2013
@@ -103,6 +103,8 @@ public class NativeCommand {
             if (stdin != null) {
                 swin = new StreamCopier(new FileInputStream(stdin), proc.getOutputStream());
                 swin.start();
+            } else {
+                proc.getOutputStream().close(); // ensure the application does not hang if
it requests input
             }
             int exitVal = proc.waitFor();
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1509896&r1=1509895&r2=1509896&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Aug  2 22:32:57 2013
@@ -230,6 +230,7 @@ Previously the default was 1, which coul
 <li><bugzilla>54913</bugzilla> - JMSPublisherGui incorrectly restores its
state</li>
 <li><bugzilla>55027</bugzilla> - Test Action regression, duration value
is not recorded (nightly build)</li>
 <li><bugzilla>55163</bugzilla> - BeanShellTestElement fails to quote string
when calling testStarted(String)/testEnded(String)</li>
+<li><bugzilla>55349</bugzilla> - NativeCommand hangs if no input file is
specified and the application requests input</li>
 </ul>
 
 <h3>Controllers</h3>



Mime
View raw message