diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 16:11:49 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 16:11:49 +0100 |
| commit | c53ac81f746ec2fb4c5783fe0637560be3e5a6bf (patch) | |
| tree | f15db862b19252b691459b71a265ae4f01a8ace1 /cpp/demo | |
| parent | ICE-6170 - fixed behavior of batch requests (diff) | |
| download | ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.tar.bz2 ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.tar.xz ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.zip | |
Fixed ICE-6362 : fixed IceLocatorDiscovery infinite retry
Diffstat (limited to 'cpp/demo')
| -rw-r--r-- | cpp/demo/IceGrid/replication/config.node1 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceGrid/replication/config.node2 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceGrid/replication/config.replica1 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceGrid/replication/config.replica2 | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceGrid/replication/expect.py | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/cpp/demo/IceGrid/replication/config.node1 b/cpp/demo/IceGrid/replication/config.node1 index 1e75823b868..ccdc04f6f6a 100644 --- a/cpp/demo/IceGrid/replication/config.node1 +++ b/cpp/demo/IceGrid/replication/config.node1 @@ -8,7 +8,7 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 # property above and un-comment the two properties below. The discovery # plugin uses multicast to discover IceGrid. # -#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscoveryy +#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscovery #IceGrid.InstanceName=ReplicationDemoIceGrid # diff --git a/cpp/demo/IceGrid/replication/config.node2 b/cpp/demo/IceGrid/replication/config.node2 index a1c5a95ae29..37c0a629a0e 100644 --- a/cpp/demo/IceGrid/replication/config.node2 +++ b/cpp/demo/IceGrid/replication/config.node2 @@ -8,7 +8,7 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 # property above and un-comment the two properties below. The discovery # plugin uses multicast to discover IceGrid. # -#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscoveryy +#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscovery #IceGrid.InstanceName=ReplicationDemoIceGrid # diff --git a/cpp/demo/IceGrid/replication/config.replica1 b/cpp/demo/IceGrid/replication/config.replica1 index f6ae90f27a9..44213f31592 100644 --- a/cpp/demo/IceGrid/replication/config.replica1 +++ b/cpp/demo/IceGrid/replication/config.replica1 @@ -8,7 +8,7 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 # property above and un-comment the two properties below. The discovery # plugin uses multicast to discover IceGrid. # -#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscoveryy +#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscovery #IceGrid.InstanceName=ReplicationDemoIceGrid # diff --git a/cpp/demo/IceGrid/replication/config.replica2 b/cpp/demo/IceGrid/replication/config.replica2 index eb1a14db341..f7158625272 100644 --- a/cpp/demo/IceGrid/replication/config.replica2 +++ b/cpp/demo/IceGrid/replication/config.replica2 @@ -8,7 +8,7 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 # property above and un-comment the two properties below. The discovery # plugin uses multicast to discover IceGrid. # -#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscoveryy +#Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscovery #IceGrid.InstanceName=ReplicationDemoIceGrid # diff --git a/cpp/demo/IceGrid/replication/expect.py b/cpp/demo/IceGrid/replication/expect.py index e792ac9bddf..8396d271622 100755 --- a/cpp/demo/IceGrid/replication/expect.py +++ b/cpp/demo/IceGrid/replication/expect.py @@ -114,9 +114,9 @@ print("running with Ice.Default.Locator set") properties = ' --Ice.PrintAdapterReady --Ice.StdErr= --Ice.StdOut=' runDemo(properties, '') -print("running with IceGridDiscovery") -discovery = ' --Ice.Plugin.IceGridDiscovery=IceGrid:createIceGridDiscovery' + \ - ' --IceGridDiscovery.InstanceName=ReplicationDemoIceGrid' + \ +print("running with IceLocatorDiscovery") +discovery = ' --Ice.Plugin.IceLocatorDiscovery=IceLocatorDiscovery:createIceLocatorDiscovery' + \ + ' --IceLocatorDiscovery.InstanceName=ReplicationDemoIceGrid' + \ ' --Ice.Default.Locator=' properties = ' --Ice.PrintAdapterReady --Ice.StdErr= --Ice.StdOut= --Ice.Default.Locator=' runDemo(properties + discovery, discovery) |