summaryrefslogtreecommitdiff
path: root/java/test/Ice
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-09-20 13:12:50 +0000
committerMarc Laukien <marc@zeroc.com>2002-09-20 13:12:50 +0000
commitd99db9620ba052e79cd5bd40c75306f600f9c48c (patch)
tree8b5bf4d7b52f1e60469cb48e6b466e7f4b08c41f /java/test/Ice
parentminor (diff)
downloadice-d99db9620ba052e79cd5bd40c75306f600f9c48c.tar.bz2
ice-d99db9620ba052e79cd5bd40c75306f600f9c48c.tar.xz
ice-d99db9620ba052e79cd5bd40c75306f600f9c48c.zip
Runtime->Local
Diffstat (limited to 'java/test/Ice')
-rw-r--r--java/test/Ice/exceptions/AllTests.java4
-rw-r--r--java/test/Ice/exceptions/Client.java4
-rw-r--r--java/test/Ice/exceptions/Collocated.java4
-rw-r--r--java/test/Ice/exceptions/Server.java4
-rw-r--r--java/test/Ice/exceptions/Test.ice2
-rw-r--r--java/test/Ice/exceptions/ThrowerI.java4
-rw-r--r--java/test/Ice/facets/Client.java4
-rw-r--r--java/test/Ice/facets/Collocated.java4
-rw-r--r--java/test/Ice/facets/Server.java4
-rw-r--r--java/test/Ice/faultTolerance/Client.java4
-rw-r--r--java/test/Ice/faultTolerance/Server.java4
-rw-r--r--java/test/Ice/inheritance/Client.java4
-rw-r--r--java/test/Ice/inheritance/Collocated.java4
-rw-r--r--java/test/Ice/inheritance/Server.java4
-rw-r--r--java/test/Ice/location/AllTests.java2
-rw-r--r--java/test/Ice/location/Client.java4
-rw-r--r--java/test/Ice/location/Server.java4
-rw-r--r--java/test/Ice/locationForward/Client.java4
-rw-r--r--java/test/Ice/locationForward/Server.java4
-rw-r--r--java/test/Ice/objects/Client.java4
-rw-r--r--java/test/Ice/objects/Collocated.java4
-rw-r--r--java/test/Ice/objects/Server.java4
-rw-r--r--java/test/Ice/operations/Client.java4
-rw-r--r--java/test/Ice/operations/Collocated.java4
-rw-r--r--java/test/Ice/operations/Server.java4
25 files changed, 48 insertions, 48 deletions
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 1860ccca610..177d1fc3a16 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -424,13 +424,13 @@ public class AllTests
try
{
- thrower.throwRuntimeException();
+ thrower.throwLocalException();
test(false);
}
catch(Ice.TimeoutException ex)
{
}
- catch(Ice.UnknownRuntimeException ex)
+ catch(Ice.UnknownLocalException ex)
{
// We get the an unknown local exception without collocation
// optimization.
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index f9f45721cae..baa05a6bf0d 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -29,7 +29,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -41,7 +41,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index abde7f70098..40974d85987 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -46,7 +46,7 @@ public class Collocated
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index f928c25a084..14e92c82ed3 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -35,7 +35,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -47,7 +47,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index de4423e90ea..ffc5fc673ff 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -47,7 +47,7 @@ interface Thrower
void throwUndeclaredA(int a) throws B, D;
void throwUndeclaredB(int a, int b);
void throwUndeclaredC(int a, int b, int c) throws D;
- void throwRuntimeException();
+ void throwLocalException();
void throwNonIceException();
};
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index e30753ba812..1abf04d7727 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -101,7 +101,7 @@ public final class ThrowerI extends _ThrowerDisp
}
public void
- throwRuntimeException(Ice.Current current)
+ throwLocalException(Ice.Current current)
{
throw new Ice.TimeoutException();
}
@@ -109,7 +109,7 @@ public final class ThrowerI extends _ThrowerDisp
public void
throwNonIceException(Ice.Current current)
{
- throw new java.lang.RuntimeException();
+ throw new RuntimeException();
}
public void
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index d1127b22c3c..e700d7004d0 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -29,7 +29,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -41,7 +41,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 579a1b08693..352fedc80d7 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -40,7 +40,7 @@ public class Collocated
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -52,7 +52,7 @@ public class Collocated
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 4916b023cea..e7fe97165b3 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -41,7 +41,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -53,7 +53,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 9e27b2c327b..ea57971e94d 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -74,7 +74,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -86,7 +86,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index f893b890542..6198d5edce9 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -76,7 +76,7 @@ public class Server
communicator = Ice.Util.initialize(argsH);
status = run(argsH.value, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -88,7 +88,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index 7e51cb3e1f9..54fd01a860b 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -29,7 +29,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -41,7 +41,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 4c9f51f4186..b23c19017d9 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -46,7 +46,7 @@ public class Collocated
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 6ca4ff42c2a..524385b4c00 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -33,7 +33,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -45,7 +45,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 33d3dd640f2..16a5507567e 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -72,7 +72,7 @@ public class AllTests
{
obj2.ice_ping();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
test(false);
}
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index d592ba87814..b5aba44d35b 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -30,7 +30,7 @@ public class Client
communicator = Ice.Util.initializeWithProperties(args, properties);
status = run(args, communicator);
}
- catch (Ice.RuntimeException ex)
+ catch (Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -42,7 +42,7 @@ public class Client
{
communicator.destroy();
}
- catch (Ice.RuntimeException ex)
+ catch (Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index f7a7ef32d4e..ba4dc54ef95 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -55,7 +55,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -67,7 +67,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/locationForward/Client.java b/java/test/Ice/locationForward/Client.java
index bb98618dc79..0a0f6482e7d 100644
--- a/java/test/Ice/locationForward/Client.java
+++ b/java/test/Ice/locationForward/Client.java
@@ -89,7 +89,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -101,7 +101,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/locationForward/Server.java b/java/test/Ice/locationForward/Server.java
index fdf962fa742..baa44b0b824 100644
--- a/java/test/Ice/locationForward/Server.java
+++ b/java/test/Ice/locationForward/Server.java
@@ -93,7 +93,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -105,7 +105,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index 6ccb4bb13ad..3f715c262a3 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -34,7 +34,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -46,7 +46,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index bb99a16eecf..3b14d86c061 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -46,7 +46,7 @@ public class Collocated
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 6ca4ff42c2a..524385b4c00 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -33,7 +33,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -45,7 +45,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 413569e88e8..bb4068c4c09 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -46,7 +46,7 @@ public class Client
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -58,7 +58,7 @@ public class Client
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 5004ba15206..fb99b620d2a 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -46,7 +46,7 @@ public class Collocated
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index 61e3ecb9395..768313556d6 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -33,7 +33,7 @@ public class Server
communicator = Ice.Util.initialize(args);
status = run(args, communicator);
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;
@@ -45,7 +45,7 @@ public class Server
{
communicator.destroy();
}
- catch(Ice.RuntimeException ex)
+ catch(Ice.LocalException ex)
{
ex.printStackTrace();
status = 1;