summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/helper/ProcessHandler.java
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-05 14:16:35 +0200
committerNoel Grandin <noel@peralex.com>2015-11-05 14:55:15 +0200
commitb73db446ac9681fdfc4ad602c6da7ce3e36a8588 (patch)
tree6107f4347c188f4c14840c01167b2f05b2f5ad48 /qadevOOo/runner/helper/ProcessHandler.java
parentdfcb982ae8810e22204bc15fd7c119a903900a53 (diff)
java: combine nested if statements
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
Diffstat (limited to 'qadevOOo/runner/helper/ProcessHandler.java')
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 999a0097fd8e..607c1f21a2c2 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -509,14 +509,11 @@ public class ProcessHandler
}
}
- if (bKillProcessAfterTimeout)
+ if (bKillProcessAfterTimeout && !isFinished)
{
- if (!isFinished)
- {
- log.println("Going to destroy the process!!");
- m_aProcess.destroy();
- log.println("Process has been destroyed!");
- }
+ log.println("Going to destroy the process!!");
+ m_aProcess.destroy();
+ log.println("Process has been destroyed!");
}
return isFinished();