diff options
Diffstat (limited to 'java/demo/Ice/bidir')
-rwxr-xr-x | java/demo/Ice/bidir/CallbackSenderI.java | 72 | ||||
-rwxr-xr-x | java/demo/Ice/bidir/Client.java | 14 | ||||
-rwxr-xr-x | java/demo/Ice/bidir/Server.java | 34 |
3 files changed, 60 insertions, 60 deletions
diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java index 71a8745f900..05805692ca7 100755 --- a/java/demo/Ice/bidir/CallbackSenderI.java +++ b/java/demo/Ice/bidir/CallbackSenderI.java @@ -19,56 +19,56 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable synchronized public void destroy() { - System.out.println("destroying callback sender"); - _destroy = true; + System.out.println("destroying callback sender"); + _destroy = true; - this.notify(); + this.notify(); } synchronized public void addClient(Ice.Identity ident, Ice.Current current) { - System.out.println("adding client `" + _communicator.identityToString(ident) + "'"); + System.out.println("adding client `" + _communicator.identityToString(ident) + "'"); - Ice.ObjectPrx base = current.con.createProxy(ident); - CallbackReceiverPrx client = CallbackReceiverPrxHelper.uncheckedCast(base); - _clients.addElement(client); + Ice.ObjectPrx base = current.con.createProxy(ident); + CallbackReceiverPrx client = CallbackReceiverPrxHelper.uncheckedCast(base); + _clients.addElement(client); } synchronized public void run() { - while(!_destroy) - { - try - { - this.wait(2000); - } - catch(java.lang.InterruptedException ex) - { - } + while(!_destroy) + { + try + { + this.wait(2000); + } + catch(java.lang.InterruptedException ex) + { + } - if(!_destroy && !_clients.isEmpty()) - { - ++_num; + if(!_destroy && !_clients.isEmpty()) + { + ++_num; - java.util.Iterator p = _clients.iterator(); - while(p.hasNext()) - { - CallbackReceiverPrx r = (CallbackReceiverPrx)p.next(); - try - { - r.callback(_num); - } - catch(Exception ex) - { - System.out.println("removing client `" + _communicator.identityToString(r.ice_getIdentity()) + "':"); - ex.printStackTrace(); - p.remove(); - } - } - } - } + java.util.Iterator p = _clients.iterator(); + while(p.hasNext()) + { + CallbackReceiverPrx r = (CallbackReceiverPrx)p.next(); + try + { + r.callback(_num); + } + catch(Exception ex) + { + System.out.println("removing client `" + _communicator.identityToString(r.ice_getIdentity()) + "':"); + ex.printStackTrace(); + p.remove(); + } + } + } + } } private Ice.Communicator _communicator; diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java index b7c3136f220..84c4989a6e5 100755 --- a/java/demo/Ice/bidir/Client.java +++ b/java/demo/Ice/bidir/Client.java @@ -15,7 +15,7 @@ public class Client extends Ice.Application run(String[] args) { CallbackSenderPrx server = - CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer")); + CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer")); if(server == null) { System.err.println("invalid proxy"); @@ -23,14 +23,14 @@ public class Client extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapter(""); - Ice.Identity ident = new Ice.Identity(); - ident.name = Ice.Util.generateUUID(); - ident.category = ""; + Ice.Identity ident = new Ice.Identity(); + ident.name = Ice.Util.generateUUID(); + ident.category = ""; adapter.add(new CallbackReceiverI(), ident); adapter.activate(); - server.ice_getConnection().setAdapter(adapter); - server.addClient(ident); - communicator().waitForShutdown(); + server.ice_getConnection().setAdapter(adapter); + server.addClient(ident); + communicator().waitForShutdown(); return 0; } diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java index 2a97cc22795..47106babf54 100755 --- a/java/demo/Ice/bidir/Server.java +++ b/java/demo/Ice/bidir/Server.java @@ -19,24 +19,24 @@ public class Server extends Ice.Application adapter.add(sender, communicator().stringToIdentity("sender")); adapter.activate(); - Thread t = new Thread(sender); - t.start(); + Thread t = new Thread(sender); + t.start(); - try - { - communicator().waitForShutdown(); - } - finally - { - sender.destroy(); - try - { - t.join(); - } - catch(java.lang.InterruptedException ex) - { - } - } + try + { + communicator().waitForShutdown(); + } + finally + { + sender.destroy(); + try + { + t.join(); + } + catch(java.lang.InterruptedException ex) + { + } + } return 0; } |