You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/10/31 21:07:35 UTC
[jmeter] branch master updated (38eb2be -> 25d050f)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 38eb2be Use (ctrl|meta)+shift+wheel for font zoom rather than ctrl+zoom
new a672c08 Typo
new 25d050f Add missing throws javadoc for TimeoutException
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[jmeter] 01/02: Typo
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit a672c086a63a40c5a5203c7a877dc5db8f37ede8
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Oct 31 22:03:37 2019 +0100
Typo
---
src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
index 1814edc..bac14d1 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
@@ -40,7 +40,7 @@ import org.apache.jorphan.util.JOrphanUtils;
*/
public class SystemCommand {
/**
- * @deprecated does not make sense anymore. Superceded by {@link Process#wait(long)}
+ * @deprecated does not make sense anymore. Superseded by {@link Process#wait(long)}
*/
@Deprecated
public static final int POLL_INTERVAL = 100;
[jmeter] 02/02: Add missing throws javadoc for TimeoutException
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 25d050f5d404f89a5621484263cc68d9152e122a
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Oct 31 22:06:27 2019 +0100
Add missing throws javadoc for TimeoutException
---
src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
index bac14d1..b737fa9 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
@@ -128,6 +128,7 @@ public class SystemCommand {
* @return return code
* @throws InterruptedException when execution was interrupted
* @throws IOException when I/O error occurs while execution
+ * @throws TimeoutException when timeout is reached while execution
*/
public int run(List<String> arguments) throws InterruptedException, IOException, TimeoutException {
return run(arguments, stdin, stdout, stderr);