mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Stahl
2012-03-02 13:49:19 +01:00
parent 56665a8a22
commit 90f7a3ada6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unotest/source/java/org/openoffice/test/OfficeConnection.java
View File

@@ -128,6 +128,12 @@ public final class OfficeConnection {
context = null; context = null;
try { try {
desktopTerminated = desktop.terminate(); 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) {} } catch (DisposedException e) {}
// it appears that DisposedExceptions can already happen // it appears that DisposedExceptions can already happen
// while receiving the response of the terminate call // while receiving the response of the terminate call
@@ -142,7 +148,6 @@ public final class OfficeConnection {
} }
boolean outTerminated = outForward == null || outForward.terminated(); boolean outTerminated = outForward == null || outForward.terminated();
boolean errTerminated = errForward == null || errForward.terminated(); boolean errTerminated = errForward == null || errForward.terminated();
assertTrue(desktopTerminated);
assertEquals(0, code); assertEquals(0, code);
assertTrue(outTerminated); assertTrue(outTerminated);
assertTrue(errTerminated); assertTrue(errTerminated);