diff options
| author | Anthony Neal <aneal@zeroc.com> | 2001-11-13 15:42:30 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2001-11-13 15:42:30 +0000 |
| commit | fcd722bf5050ea9f3b96288bc30fe539744b3e00 (patch) | |
| tree | aaee49bc6dc47c3abd88b3b0c2abe91dd3f2a824 /cpp/src/Ice/Collector.cpp | |
| parent | minor fixes (diff) | |
| download | ice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.tar.bz2 ice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.tar.xz ice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.zip | |
Incorporates SSL, with all Ice tests running under SSL.
Diffstat (limited to 'cpp/src/Ice/Collector.cpp')
| -rw-r--r-- | cpp/src/Ice/Collector.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cpp/src/Ice/Collector.cpp b/cpp/src/Ice/Collector.cpp index e5a44fd86fa..8de7adff572 100644 --- a/cpp/src/Ice/Collector.cpp +++ b/cpp/src/Ice/Collector.cpp @@ -21,11 +21,13 @@ #include <Ice/Incoming.h> #include <Ice/Exception.h> #include <Ice/Protocol.h> -#include <Ice/Functional.h> +#include <Ice/Functional.h>
+#include <Ice/SslException.h> using namespace std; using namespace Ice; -using namespace IceInternal; +using namespace IceInternal;
+using IceSecurity::SecurityException; void IceInternal::incRef(Collector* p) { p->__incRef(); } void IceInternal::decRef(Collector* p) { p->__decRef(); } @@ -564,7 +566,17 @@ IceInternal::CollectorFactory::message(BasicStream&) CollectorPtr collector = new Collector(_instance, _adapter, transceiver, _endpoint); collector->activate(); _collectors.push_back(collector); + }
+ catch (const SecurityException&)
+ {
+ // TODO: bandaid. Takes care of SSL Handshake problems during creation of a Transceiver
+ // Ignore, nothing we can do here
} + catch (const SocketException&)
+ {
+ // TODO: bandaid. Takes care of SSL Handshake problems during creation of a Transceiver
+ // Ignore, nothing we can do here
+ }
catch (const TimeoutException&) { // Ignore timeouts |