[Libreoffice-commits] core.git: unotest/source

[Stephan Bergmann]

 unotest/source/java/org/openoffice/test/OfficeConnection.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62df5aabcdb3dc99ada137a5fa06707ec671d1fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 30 18:23:23 2013 +0200

    gdb-core-bt.sh expects three arguments now
    
    ...since 29b59f2e87d1b00ab6a1f4cc4e960603974992bc "gdb-core-bt: don't talk about
    core files without a reason."
    
    Change-Id: I45640a5724fd98faf3a7c1e44e904f880cc9fc6a

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index de6e705..5ecf3b6 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -104,6 +104,7 @@ public final class OfficeConnection {
         throws InterruptedException, com.sun.star.uno.Exception
     {
         boolean cleanTermination = false;
+        int code = 0;
         try {
             boolean desktopTerminated = true;
             if (process != null) {
@@ -140,7 +141,6 @@ public final class OfficeConnection {
                     process.destroy();
                 }
             }
-            int code = 0;
             if (process != null) {
                 code = process.waitFor();
             }
@@ -165,7 +165,7 @@ public final class OfficeConnection {
                         ProcessBuilder pb = new ProcessBuilder(
                             postprocesscommand,
                             sofficeArg.substring("path:".length()) + ".bin",
-                            workdir);
+                            workdir, String.valueOf(code));
                         Process postprocess = pb.start();
                         Forward ppoutForward = new Forward(
                             postprocess.getInputStream(), System.out);
@@ -173,7 +173,7 @@ public final class OfficeConnection {
                         Forward pperrForward = new Forward(
                             postprocess.getErrorStream(), System.err);
                         pperrForward.start();
-                        int code = postprocess.waitFor();
+                        code = postprocess.waitFor();
                         if (code != 0) {
                             throw new PostprocessFailedException(code);
                         }