diff options
-rw-r--r-- | qadevOOo/runner/helper/OfficeProvider.java | 17 | ||||
-rw-r--r-- | qadevOOo/runner/helper/OfficeWatcher.java | 13 | ||||
-rw-r--r-- | qadevOOo/runner/util/PropertyName.java | 4 |
3 files changed, 0 insertions, 34 deletions
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 19890e93edcb..a1d39100ccbf 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -497,23 +497,6 @@ public class OfficeProvider implements AppProvider } } - final String AppKillCommand = (String) param.get(util.PropertyName.APP_KILL_COMMAND); - if (AppKillCommand != null) - { - String sAppKillCommand = StringHelper.removeSurroundQuoteIfExists(AppKillCommand); - final StringTokenizer aKillCommandToken = new StringTokenizer(sAppKillCommand, ";"); - while (aKillCommandToken.hasMoreTokens()) - { - final String sKillCommand = aKillCommandToken.nextToken(); - dbg("User defined an application to destroy the started process. Trying to execute: " + sKillCommand); - - final ProcessHandler pHdl = new ProcessHandler(sKillCommand, 1000); // 3000 seems to be too long - pHdl.runCommand(); - - pHdl.kill(); - } - } - final ProcessHandler ph = (ProcessHandler) param.get("AppProvider"); if (ph != null) diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index 241115e775bd..ac35513953a9 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -78,19 +78,6 @@ public class OfficeWatcher extends Thread implements share.Watcher { if (ph != null) { dbg("the Office is idle for " + timeOut / 1000 + " seconds, it probably hangs and is killed NOW."); - final String AppKillCommand = (String) params.get(util.PropertyName.APP_KILL_COMMAND); - if (AppKillCommand != null) { - final StringTokenizer aKillCommandToken = new StringTokenizer(AppKillCommand, ";"); - while (aKillCommandToken.hasMoreTokens()) { - final String sKillCommand = aKillCommandToken.nextToken(); - - dbg("User defined an application to destroy the started process."); - dbg("Trying to execute: " + sKillCommand); - - final ProcessHandler pHdl = new ProcessHandler(sKillCommand); - pHdl.executeSynchronously(); - } - } ph.kill(); } else { dbg("reaeched timeout but ProcessHandler is NULL"); diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 4207d4fe1669..1932a74c6fa7 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -29,10 +29,6 @@ public interface PropertyName { */ String APP_EXECUTION_COMMAND = "AppExecutionCommand"; /** - * parameter name: "AppKillCommand" - */ - String APP_KILL_COMMAND = "AppKillCommand"; - /** * parameter name: "ConnectionString" */ String CONNECTION_STRING = "ConnectionString"; |