[GNUnet-SVN] r21961 - gnunet-java/src/org/gnunet/testing

[gnunet]

Author: dold
Date: 2012-06-13 14:34:52 +0200 (Wed, 13 Jun 2012)
New Revision: 21961

Modified:
   gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
Log:
fix

Modified: gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
===================================================================
--- gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-06-13 
12:27:31 UTC (rev 21960)
+++ gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-06-13 
12:34:52 UTC (rev 21961)
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
 
 /**
 * @author Florian Dold
@@ -91,7 +90,7 @@
     }
     public void destroy() {
         try {
-            p.getOutputStream().close();
+            writer.write("q\n");
         } catch (IOException e) {
             throw new TestingSetup.SetupException(e);
         }
@@ -111,18 +110,7 @@
             throw new TestingSetup.SetupException(e);
         }
         if (p.exitValue() != 0) {
-            logger.debug("exit value unsuccessful, trying to get error 
message");
-            String err;
-            try {
-                int available = p.getErrorStream().available();
-                byte[] buf = new byte[available];
-                int n_read = p.getErrorStream().read(buf, 0, available);
-                err = new String(buf, 0, available, Charset.defaultCharset());
-            } catch (IOException e) {
-                throw new TestingSetup.SetupException("could not read from 
stderr after exit value was wrong");
-            }
-
-            throw new TestingSetup.SetupException("failed, got error message 
from wrapper: " + err);
+            throw new TestingSetup.SetupException("gnunet-testing-run-service 
exit value unsuccessful");
         }
     }