jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1519372 - in /jmeter/trunk/src: jorphan/org/apache/jorphan/exec/SystemCommand.java protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
Date Mon, 02 Sep 2013 09:20:23 GMT
Author: sebb
Date: Mon Sep  2 09:20:22 2013
New Revision: 1519372

URL: http://svn.apache.org/r1519372
Log:
Enhancement to OS sampler: Support for timeout
Use constant so default timeout is shared
Bugzilla Id: 55403

Modified:
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java?rev=1519372&r1=1519371&r2=1519372&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java Mon Sep  2 09:20:22
2013
@@ -32,7 +32,7 @@ import org.apache.jorphan.util.JOrphanUt
  * Utility class for invoking native system applications
  */
 public class SystemCommand {
-    protected static final int POLL_INTERVAL = 100;
+    public static final int POLL_INTERVAL = 100;
     private StreamGobbler outputGobbler;
     private final File directory;
     private final Map<String, String> env;

Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java?rev=1519372&r1=1519371&r2=1519372&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
(original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
Mon Sep  2 09:20:22 2013
@@ -48,7 +48,7 @@ import org.apache.log.Logger;
  */
 public class SystemSampler extends AbstractSampler {
 
-    private static final int POLL_INTERVAL = JMeterUtils.getPropDefault("os_sampler.poll_for_timeout",
100);
+    private static final int POLL_INTERVAL = JMeterUtils.getPropDefault("os_sampler.poll_for_timeout",
SystemCommand.POLL_INTERVAL);
 
     private static final long serialVersionUID = 1;
     



Mime
View raw message