summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/helper/ProcessHandler.java
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 15:13:58 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 15:13:58 +0000
commit3cf4f345114803f4e4af08b91d61c36a3d57312e (patch)
treeeef25b36a88dd81cbadf5339a9fe72cd298ee3a8 /qadevOOo/runner/helper/ProcessHandler.java
parent6ae8d4333c2057832ea5320abc2715b8996f508f (diff)
CWS-TOOLING: integrate CWS qadev37
2008-12-19 11:19:12 +0100 cn r265721 : #i97194 implement cwstouched in perl to avoid problems in python libary stuff 2008-12-19 11:07:50 +0100 cn r265720 : #i97194 implement cwstouched in perl to avoid problems in python libary stuff 2008-12-19 11:06:24 +0100 cn r265719 : #i97194 implement cwstouched in perl to avoid problems in python libary stuff 2008-12-17 12:37:50 +0100 lla r265595 : #i97357# us of illegal characters in file
Diffstat (limited to 'qadevOOo/runner/helper/ProcessHandler.java')
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 00da332acf5d..c1892094d093 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -338,20 +338,21 @@ public class ProcessHandler {
ow = (OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER);
}
- while (changedText && !this.isFinished()) {
+ while (!this.isFinished() && changedText) {
count++;
if (ow != null) {
ow.ping();
}
dbg("runCommand: waiting " + mTimeOut / 1000 + " seconds while command execution is ongoing... " + count);
shortWait(mTimeOut);
+ //waitFor(mTimeOut);
if (ow != null) {
ow.ping();
}
// check for changes in the output stream. If there are no changes, the process maybe hangs
if (!this.isFinished()) {
- if (this.getOutputText().equals(memText)) {
+ if (this.getOutputText().length() == memText.length()) {
changedText = false;
dbg("runCommand Could not detect changes in output stream!!!");