diff options
Diffstat (limited to 'java/demo')
-rw-r--r-- | java/demo/Glacier/session/Client.java | 18 | ||||
-rw-r--r-- | java/demo/Glacier/session/Server.java | 16 | ||||
-rw-r--r-- | java/demo/Ice/hello/Client.java | 18 | ||||
-rw-r--r-- | java/demo/Ice/hello/Server.java | 20 | ||||
-rw-r--r-- | java/demo/Ice/latency/Client.java | 18 | ||||
-rw-r--r-- | java/demo/Ice/latency/Server.java | 18 | ||||
-rw-r--r-- | java/demo/Ice/throughput/Client.java | 16 | ||||
-rw-r--r-- | java/demo/Ice/throughput/Server.java | 16 | ||||
-rw-r--r-- | java/demo/Ice/value/Client.java | 16 | ||||
-rw-r--r-- | java/demo/Ice/value/Server.java | 16 | ||||
-rw-r--r-- | java/demo/IceBox/hello/Client.java | 16 |
11 files changed, 50 insertions, 138 deletions
diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java index 179e79792cf..9eed44215f2 100644 --- a/java/demo/Glacier/session/Client.java +++ b/java/demo/Glacier/session/Client.java @@ -247,20 +247,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } + } System.exit(status); } diff --git a/java/demo/Glacier/session/Server.java b/java/demo/Glacier/session/Server.java index 293ddb98aa2..d5716e100ec 100644 --- a/java/demo/Glacier/session/Server.java +++ b/java/demo/Glacier/session/Server.java @@ -69,20 +69,12 @@ public class Server { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 3365d71c0a6..c5a75693aba 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -192,20 +192,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } + } System.exit(status); } diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index 9dd38f7b603..42b62fdc16b 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -42,20 +42,12 @@ public class Server { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } finally { + if(communicator != null) + { + communicator.destroy(); + } + } System.exit(status); } diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index cd30a9f9d16..3fe8e4bce9e 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -72,20 +72,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } + } System.exit(status); } diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index a71d8ef725f..5ff640e21f7 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -42,20 +42,12 @@ public class Server { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } + } System.exit(status); } diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index 62495e1990a..4c58e7f303c 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -193,20 +193,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java index 644840db3c7..3ac18796c4b 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -42,20 +42,12 @@ public class Server { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index 9058936804f..6ae04119498 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -203,20 +203,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java index f49a9cb1731..e841207b1d8 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -42,20 +42,12 @@ public class Server { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index a6564f661dc..191412c3ebc 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -187,20 +187,12 @@ public class Client { ex.printStackTrace(); status = 1; - } - - if(communicator != null) - { - try - { + } finally { + if(communicator != null) + { communicator.destroy(); } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } - } + } System.exit(status); } |