revert accidentally commited changes

1 files changed, 1 insertions, 23 deletions

diff --git a/test/source/java/org/openoffice/test/OfficeConnection.java b/test/source/java/org/openoffice/test/OfficeConnection.java
index fcdd2ac4cfa6..d0976689111e 100644
--- a/test/source/java/org/openoffice/test/OfficeConnection.java
+++ b/test/source/java/org/openoffice/test/OfficeConnection.java
@@ -46,20 +46,6 @@ import static org.junit.Assert.*;
     Details about the OOo instance are tunneled in via
     org.openoffice.test.arg.... system properties.
 */
-final class ShutdownKiller implements java.lang.Runnable {
-    private java.lang.Thread m_watchedThread;
-    ShutdownKiller(java.lang.Thread watchedThread) {
-        m_watchedThread = watchedThread;
-    }
-    public void run() {
-        try {
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            return;
-        };
-        m_watchedThread.interrupt();
-    }
-}
 
 public final class OfficeConnection {
     /** Start up an OOo instance.
@@ -96,7 +82,6 @@ public final class OfficeConnection {
                 "\"soffice\" argument \"" + sofficeArg +
                 " starts with neither \"path:\" nor \"connect:\"");
         }
-        Thread.sleep(2000);
         XUnoUrlResolver resolver = UnoUrlResolver.create(
             Bootstrap.createInitialComponentContext(null));
         for (;;) {
@@ -141,14 +126,7 @@ public final class OfficeConnection {
         }
         int code = 0;
         if (process != null) {
-            Thread watcher = new Thread(new ShutdownKiller(Thread.currentThread()));
-            watcher.run();
-            try {
-                code = process.waitFor();
-            } catch (InterruptedException e) {
-                assertTrue(false);
-            };
-            watcher.interrupt();
+            code = process.waitFor();
         }
         boolean outTerminated = outForward == null || outForward.terminated();
         boolean errTerminated = errForward == null || errForward.terminated();