diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/demo/Ice/callback/CallbackClient.java | 29 | ||||
| -rw-r--r-- | java/demo/Ice/callback/config | 19 | ||||
| -rw-r--r-- | java/demo/Ice/callback/config.server | 4 |
3 files changed, 39 insertions, 13 deletions
diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java index 70789ed007d..9c9e5a854df 100644 --- a/java/demo/Ice/callback/CallbackClient.java +++ b/java/demo/Ice/callback/CallbackClient.java @@ -22,6 +22,7 @@ class CallbackClient extends Ice.Application "D: send callback as batch datagram\n" + "f: flush all batch requests\n" + "S: switch secure mode on/off\n" + + "v: set/reset override context field\n" + "s: shutdown server\n" + "x: exit\n" + "?: help\n"); @@ -67,6 +68,7 @@ class CallbackClient extends Ice.Application boolean secure = false; String secureStr = ""; + String overwrite = null; menu(); @@ -99,7 +101,11 @@ class CallbackClient extends Ice.Application else if (line.equals("O")) { java.util.HashMap context = new java.util.HashMap(); - context.put("_fwd", "o" + secureStr); + context.put("_fwd", "O" + secureStr); + if (overwrite != null) + { + context.put("_ovwt", overwrite); + } batchOneway.initiateCallback(onewayR, context); } else if (line.equals("d")) @@ -111,8 +117,12 @@ class CallbackClient extends Ice.Application else if (line.equals("D")) { java.util.HashMap context = new java.util.HashMap(); - context.put("_fwd", "d" + secureStr); - batchDatagram.initiateCallback(datagramR, context); + context.put("_fwd", "D" + secureStr); + if (overwrite != null) + { + context.put("_ovwt", overwrite); + } + batchDatagram.initiateCallback(datagramR, context); } else if (line.equals("f")) { @@ -145,6 +155,19 @@ class CallbackClient extends Ice.Application System.out.println("secure mode is now off"); } } + else if (line.equals("v")) + { + if (overwrite == null) + { + overwrite = "some_value"; + System.out.println("overwrite context field is now `" + overwrite + "'"); + } + else + { + overwrite = null; + System.out.println("overwrite context field is empty"); + } + } else if (line.equals("s")) { twoway.shutdown(); diff --git a/java/demo/Ice/callback/config b/java/demo/Ice/callback/config index 832a771930a..4bdc00ec3f5 100644 --- a/java/demo/Ice/callback/config +++ b/java/demo/Ice/callback/config @@ -1,17 +1,20 @@ Callback.Callback=callback:tcp -p 10000:udp -p 10000 Ice.Adapter.CallbackReceiverAdapter.Endpoints=tcp:udp -#Ice.Trace.Security=1 -#Ice.Trace.Network=3 +#Ice.Trace.Network=1 #Ice.Trace.Protocol=1 -#Ice.ConnectionWarnings=1 +Ice.ConnectionWarnings=1 Glacier.Router.Endpoints=default -p 10005 -Glacier.Client.Endpoints=tcp:udp -c -Glacier.Server.Endpoints=tcp:udp -Glacier.Trace.Client=2 -Glacier.Trace.Server=2 -Glacier.Trace.RoutingTable=1 +Glacier.Router.Client.Endpoints=tcp:udp -c +Glacier.Router.Server.Endpoints=tcp:udp +Glacier.Router.Trace.Client=2 +Glacier.Router.Trace.Server=2 +Glacier.Router.Trace.RoutingTable=1 +Glacier.Router.Server.ForwardContext=1 +Glacier.Router.Client.ForwardContext=1 +Glacier.Router.Server.BatchSleepTime=2000 +Glacier.Router.Client.BatchSleepTime=2000 # Uncomment the following lines if you want to run this demo with Glacier Ice.Default.Router=Glacier/router:default -p 10005 diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server index 5e7c34933e0..4e0c19723c7 100644 --- a/java/demo/Ice/callback/config.server +++ b/java/demo/Ice/callback/config.server @@ -1,5 +1,5 @@ Ice.Adapter.CallbackAdapter.Endpoints=tcp -p 10000:udp -p 10000 -#Ice.Trace.Network=3 +#Ice.Trace.Network=1 #Ice.Trace.Protocol=1 -#Ice.ConnectionWarnings=1 +Ice.ConnectionWarnings=1 |