diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-11-21 17:08:45 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-11-21 17:08:45 +0000 |
| commit | bc6891fb54e110accaaf08b37a83d7c8d9809d63 (patch) | |
| tree | c3587bceae2f0f6e791d58699b1a6eaba1a89616 /cpp/src/Ice/Collector.cpp | |
| parent | Updated to include the Security tracing property. (diff) | |
| download | ice-bc6891fb54e110accaaf08b37a83d7c8d9809d63.tar.bz2 ice-bc6891fb54e110accaaf08b37a83d7c8d9809d63.tar.xz ice-bc6891fb54e110accaaf08b37a83d7c8d9809d63.zip | |
fixes
Diffstat (limited to 'cpp/src/Ice/Collector.cpp')
| -rw-r--r-- | cpp/src/Ice/Collector.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cpp/src/Ice/Collector.cpp b/cpp/src/Ice/Collector.cpp index b9c0ebb3e20..7beee8e1228 100644 --- a/cpp/src/Ice/Collector.cpp +++ b/cpp/src/Ice/Collector.cpp @@ -22,12 +22,11 @@ #include <Ice/Exception.h> #include <Ice/Protocol.h> #include <Ice/Functional.h> -#include <Ice/SecurityException.h> +#include <Ice/SecurityException.h> // TODO: bandaid, see below. using namespace std; using namespace Ice; using namespace IceInternal; -using IceSecurity::SecurityException; void IceInternal::incRef(Collector* p) { p->__incRef(); } void IceInternal::decRef(Collector* p) { p->__decRef(); } @@ -567,17 +566,17 @@ IceInternal::CollectorFactory::message(BasicStream&) collector->activate(); _collectors.push_back(collector); } - catch (const SecurityException& securityEx) + catch (const IceSecurity::SecurityException& ex) { - // TODO: bandaid. Takes care of SSL Handshake problems during creation of a Transceiver - // TODO: THIS DOESN'T WORK!!! For some reason it skips it. - // Ignore, nothing we can do here - warning(securityEx); + // TODO: bandaid. Takes care of SSL Handshake problems during + // creation of a Transceiver. Ignore, nothing we can do here. + warning(ex); } - catch (const SocketException&) + catch (const SocketException& ex) { - // TODO: bandaid. Takes care of SSL Handshake problems during creation of a Transceiver - // Ignore, nothing we can do here + // TODO: bandaid. Takes care of SSL Handshake problems during + // creation of a Transceiver. Ignore, nothing we can do here. + warning(ex); } catch (const TimeoutException&) { |