diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-10-03 14:28:20 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-10-03 14:28:20 +0200 |
| commit | b6ac21341d634801fc90a994fe3b385c4d1d090f (patch) | |
| tree | 9363151beb0c461e206bdd85d92eb3de59fb8ab4 /cpp | |
| parent | Fixes to makecerts.py and instructions (diff) | |
| download | ice-b6ac21341d634801fc90a994fe3b385c4d1d090f.tar.bz2 ice-b6ac21341d634801fc90a994fe3b385c4d1d090f.tar.xz ice-b6ac21341d634801fc90a994fe3b385c4d1d090f.zip | |
Fix for 7406 and issue with space in path passed to icehashpassword.py
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/winrt/StreamEndpointI.cpp | 2 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/stress/run.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index aff7ac35972..84156e4f6f7 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -184,7 +184,7 @@ IceInternal::StreamEndpointI::acceptor(const string&) const ostringstream os; os << "SSL server endpoints are not supported with UWP applications"; ex.unsupportedFeature = os.str(); - throw ex; + throw ex; } return new StreamAcceptor(const_cast<StreamEndpointI*>(this), _instance, _host, _port); } diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index d0faec8bc3c..805c8283a31 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -178,9 +178,9 @@ def runtest(type): sys.stdout.write("Sending 5000 ordered events with max queue size drop events... ") sys.stdout.flush() server1.start(echo=False, - additionalOptions = ' --IceStorm.Send.QueueSizeMax=2000 --IceStorm.Send.QueueSizeMaxPolicy=DropEvents') + additionalOptions = ' --IceStorm.Send.QueueSizeMax=4000 --IceStorm.Send.QueueSizeMaxPolicy=DropEvents') doTest(server1, - '--events 5000 --qos "reliability,ordered" --maxQueueDropEvents=2000 ' + server1.reference(), + '--events 5000 --qos "reliability,ordered" --maxQueueDropEvents=4000 ' + server1.reference(), '--events 5000') server1.stop() print("ok") @@ -188,9 +188,9 @@ def runtest(type): sys.stdout.write("Sending 5000 ordered events with max queue size remove subscriber... ") sys.stdout.flush() server1.start(echo=False, - additionalOptions = ' --IceStorm.Send.QueueSizeMax=2000 --IceStorm.Send.QueueSizeMaxPolicy=RemoveSubscriber') + additionalOptions = ' --IceStorm.Send.QueueSizeMax=4000 --IceStorm.Send.QueueSizeMaxPolicy=RemoveSubscriber') doTest(server1, - '--events 5000 --qos "reliability,ordered" --maxQueueRemoveSub=2000 ' + server1.reference(), + '--events 5000 --qos "reliability,ordered" --maxQueueRemoveSub=4000 ' + server1.reference(), '--events 5000') server1.stop() print("ok") |