Squashed commit of the following:

commit ee95291dd7f78c2c1d663ea54171aa56d418471b
Author: Matthew Newhook <matthew@november.matthew.zeroc.com>
Date:   Thu Dec 10 16:47:47 2009 -0330

    align all location tests. Fix bug with AMI with java/C#.

1 files changed, 20 insertions, 1 deletions

diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index 8f32d31cbd1..619cd5c3870 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -14,7 +14,26 @@ public class Client extends test.Util.Application
     public int run(String[] args)
     {
         Ice.Communicator communicator = communicator();
-        AllTests.allTests(communicator, getWriter());
+        try
+        {
+            AllTests.allTests(communicator, getWriter());
+        }
+        catch(Ice.AdapterAlreadyActiveException ex)
+        {
+            ex.printStackTrace();
+            throw new RuntimeException();
+        }
+        catch(Ice.AdapterNotFoundException ex)
+        {
+            ex.printStackTrace();
+            throw new RuntimeException();
+        }
+        catch(InterruptedException ex)
+        {
+            ex.printStackTrace();
+            throw new RuntimeException();
+        }
+
         return 0;
     }