From 75ecbdd337d7aee994305f6d20d4a76933d35a68 Mon Sep 17 00:00:00 2001
From: Stephane Bailliez <sbailliez@apache.org>
Date: Fri, 1 Feb 2002 19:55:48 +0000
Subject: [PATCH] - Dirty exception handling for now.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271037 13f79535-47bb-0310-9956-ffa450edef68
---
 .../optional/junit/remote/Messenger.java         |  2 +-
 .../taskdefs/optional/junit/remote/Server.java   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java
index d6daad0d3..fbfec5233 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Messenger.java
@@ -90,7 +90,7 @@ public class Messenger {
         }
     }
 
-    public TestRunEvent read() throws IOException {
+    public TestRunEvent read() throws Exception {
         return (TestRunEvent)((ObjectInputStream)in).readObject();
     }
 
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java
index 72b9fb6e4..ed9769732 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/junit/remote/Server.java
@@ -125,15 +125,21 @@ public class Server {
     public void cancel() {
         if (isRunning()) {
             TestRunEvent evt = new TestRunEvent(new Integer(-1), TestRunEvent.RUN_STOP);
-            messenger.writeEvent(evt);
+            try {
+                messenger.writeEvent(evt);
+            } catch (IOException e){
+            }
         }
     }
 
     /** shutdown the server and any running client */
     public void shutdown() {
-        if (messenger != null) {
-            messenger.close();
-            messenger = null;
+        try {
+            if (messenger != null) {
+                messenger.close();
+                messenger = null;
+            }
+        } catch (IOException e){
         }
         try {
             if (client != null) {
@@ -165,7 +171,7 @@ public class Server {
                 while ( (evt = messenger.read()) != null ) {
                     dispatcher.dispatchEvent(evt);
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 //@fixme this stacktrace might be normal when closing
                 // the socket. So decompose the above in distinct steps
                 e.printStackTrace();