OfficeConnection.java: don't wait forever if terminate() fails

1 files changed, 6 insertions, 1 deletions

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index da99d0d1922e..5eb3afa88723 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -128,6 +128,12 @@ public final class OfficeConnection {
                     context = null;
                     try {
                         desktopTerminated = desktop.terminate();
+                        if (!desktopTerminated) {
+                            // in case terminate() fails we would wait forever
+                            // for the process to die, so kill it
+                            process.destroy();
+                        }
+                        assertTrue(desktopTerminated);
                     } catch (DisposedException e) {}
                         // it appears that DisposedExceptions can already happen
                         // while receiving the response of the terminate call
@@ -142,7 +148,6 @@ public final class OfficeConnection {
             }
             boolean outTerminated = outForward == null || outForward.terminated();
             boolean errTerminated = errForward == null || errForward.terminated();
-            assertTrue(desktopTerminated);
             assertEquals(0, code);
             assertTrue(outTerminated);
             assertTrue(errTerminated);