diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-22 10:30:29 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-22 10:30:29 +0000 |
| commit | ff427ef5c8f0f7f112f93a40f23cff3c040ed9f8 (patch) | |
| tree | b6f6c3cc29eb594d50aa33ac49507f1afe262f6c /cpp | |
| parent | src/IceGrid (diff) | |
| download | ice-ff427ef5c8f0f7f112f93a40f23cff3c040ed9f8.tar.bz2 ice-ff427ef5c8f0f7f112f93a40f23cff3c040ed9f8.tar.xz ice-ff427ef5c8f0f7f112f93a40f23cff3c040ed9f8.zip | |
Oops, previous commit was accidental
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 2 | ||||
| -rw-r--r-- | cpp/demo/Ice/hello/config.client | 2 | ||||
| -rw-r--r-- | cpp/demo/IceGrid/simple/application.xml | 6 | ||||
| -rwxr-xr-x | cpp/test/Glacier2/addressFilter/Client.cpp | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index 2969fae4e0b..ec06c9f78ce 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -15,7 +15,7 @@ from threading import Thread # Set nreplicas to a number N to test replication with N replicas. # nreplicas=0 -nreplicas=2 +#nreplicas=2 for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) diff --git a/cpp/demo/Ice/hello/config.client b/cpp/demo/Ice/hello/config.client index 3d7de584748..11b0577c8cf 100644 --- a/cpp/demo/Ice/hello/config.client +++ b/cpp/demo/Ice/hello/config.client @@ -2,7 +2,7 @@ # The client reads this property to create the reference to the # "hello" object in the server. # -Hello.Proxy=hello:tcp -h 192.168.0.3 -p 10000:tcp -h 192.168.0.156 -p 10000 +Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/cpp/demo/IceGrid/simple/application.xml b/cpp/demo/IceGrid/simple/application.xml index fe0c236257e..435be193881 100644 --- a/cpp/demo/IceGrid/simple/application.xml +++ b/cpp/demo/IceGrid/simple/application.xml @@ -11,14 +11,10 @@ <icegrid> - <application name="Simple" import-default-templates="true"> + <application name="Simple"> <node name="localhost"> - <server-instance template="IcePatch2" directory="/Users/benoit/distrib"/> <server id="SimpleServer" exe="./server" activation="on-demand"> - <distrib> - <directory>${node.os}/bin</directory> - </distrib> <adapter name="Hello" endpoints="tcp" register-process="true"> <object identity="hello" type="::Demo::Hello"/> </adapter> diff --git a/cpp/test/Glacier2/addressFilter/Client.cpp b/cpp/test/Glacier2/addressFilter/Client.cpp index 7ca68ae72bd..7d738019707 100755 --- a/cpp/test/Glacier2/addressFilter/Client.cpp +++ b/cpp/test/Glacier2/addressFilter/Client.cpp @@ -110,9 +110,8 @@ AttackClient::run(int argc, char* argv[]) { Glacier2::SessionPrx session = router->createSession("userid", "abc123"); } - catch(const Glacier2::CannotCreateSessionException& ex) + catch(const Glacier2::CannotCreateSessionException&) { - cerr << ex.reason << endl; test("Unable to create new session" == 0); } BackendPrx backend = BackendPrx::uncheckedCast(communicator()->stringToProxy(p->second)); |