diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-14 15:12:37 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-14 15:12:37 -0230 |
| commit | 99b114636718d5222be16a8926af36dbb222cb63 (patch) | |
| tree | b01b228cfa8f2d95baccc756cc805c7a74fdde7d | |
| parent | ICE-5636 Gui demos do not use ice_invocationTimeout (diff) | |
| download | ice-99b114636718d5222be16a8926af36dbb222cb63.tar.bz2 ice-99b114636718d5222be16a8926af36dbb222cb63.tar.xz ice-99b114636718d5222be16a8926af36dbb222cb63.zip | |
Fixed ice_invocationTimout usage in IceDiscovery hello demos
| -rw-r--r-- | cpp/demo/IceDiscovery/hello/Client.cpp | 8 | ||||
| -rw-r--r-- | cs/demo/IceDiscovery/hello/Client.cs | 8 | ||||
| -rw-r--r-- | java/demo/IceDiscovery/hello/Client.java | 8 | ||||
| -rw-r--r-- | js/demo/Ice/hello/browser/Client.js | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/cpp/demo/IceDiscovery/hello/Client.cpp b/cpp/demo/IceDiscovery/hello/Client.cpp index a5a31d88cf0..cffd2d9f9d8 100644 --- a/cpp/demo/IceDiscovery/hello/Client.cpp +++ b/cpp/demo/IceDiscovery/hello/Client.cpp @@ -56,7 +56,7 @@ HelloClient::run(int argc, char* argv[]) // only includes the Ice object identity. It's resolved using the Ice locator // implementation. // - HelloPrx twoway = HelloPrx::checkedCast(communicator()->stringToProxy("hello")->ice_timeout(-1)); + HelloPrx twoway = HelloPrx::checkedCast(communicator()->stringToProxy("hello")); if(!twoway) { cerr << argv[0] << ": invalid proxy" << endl; @@ -129,9 +129,9 @@ HelloClient::run(int argc, char* argv[]) timeout = -1; } - twoway = twoway->ice_timeout(timeout); - oneway = oneway->ice_timeout(timeout); - batchOneway = batchOneway->ice_timeout(timeout); + twoway = twoway->ice_invocationTimeout(timeout); + oneway = oneway->ice_invocationTimeout(timeout); + batchOneway = batchOneway->ice_invocationTimeout(timeout); if(timeout == -1) { diff --git a/cs/demo/IceDiscovery/hello/Client.cs b/cs/demo/IceDiscovery/hello/Client.cs index dd8c8e93655..b88c85aa223 100644 --- a/cs/demo/IceDiscovery/hello/Client.cs +++ b/cs/demo/IceDiscovery/hello/Client.cs @@ -60,7 +60,7 @@ public class Client { } - HelloPrx twoway = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello").ice_timeout(-1)); + HelloPrx twoway = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello")); if(twoway == null) { Console.Error.WriteLine("invalid proxy"); @@ -138,9 +138,9 @@ public class Client timeout = -1; } - twoway = (HelloPrx)twoway.ice_timeout(timeout); - oneway = (HelloPrx)oneway.ice_timeout(timeout); - batchOneway = (HelloPrx)batchOneway.ice_timeout(timeout); + twoway = (HelloPrx)twoway.ice_invocationTimeout(timeout); + oneway = (HelloPrx)oneway.ice_invocationTimeout(timeout); + batchOneway = (HelloPrx)batchOneway.ice_invocationTimeout(timeout); if(timeout == -1) { diff --git a/java/demo/IceDiscovery/hello/Client.java b/java/demo/IceDiscovery/hello/Client.java index 651532ec2c6..9ecbb7fec51 100644 --- a/java/demo/IceDiscovery/hello/Client.java +++ b/java/demo/IceDiscovery/hello/Client.java @@ -64,7 +64,7 @@ public class Client extends Ice.Application // setInterruptHook(new ShutdownHook()); - HelloPrx twoway = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello").ice_timeout(-1)); + HelloPrx twoway = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello")); if(twoway == null) { System.err.println("invalid proxy"); @@ -144,9 +144,9 @@ public class Client extends Ice.Application timeout = -1; } - twoway = (HelloPrx)twoway.ice_timeout(timeout); - oneway = (HelloPrx)oneway.ice_timeout(timeout); - batchOneway = (HelloPrx)batchOneway.ice_timeout(timeout); + twoway = (HelloPrx)twoway.ice_invocationTimeout(timeout); + oneway = (HelloPrx)oneway.ice_invocationTimeout(timeout); + batchOneway = (HelloPrx)batchOneway.ice_invocationTimeout(timeout); if(timeout == -1) { diff --git a/js/demo/Ice/hello/browser/Client.js b/js/demo/Ice/hello/browser/Client.js index 23a720cca9e..c1a460ccb56 100644 --- a/js/demo/Ice/hello/browser/Client.js +++ b/js/demo/Ice/hello/browser/Client.js @@ -28,7 +28,7 @@ function createProxy() // Set or clear the timeout. // var timeout = $("#timeout").val(); - proxy = proxy.ice_timeout(timeout > 0 ? timeout : -1); + proxy = proxy.ice_invocationTimeout(timeout > 0 ? timeout : -1); // // Set the mode and protocol |