diff options
Diffstat (limited to 'cpp/src/Ice/Collector.cpp')
-rw-r--r-- | cpp/src/Ice/Collector.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/Ice/Collector.cpp b/cpp/src/Ice/Collector.cpp index 8de7adff572..360cb89739a 100644 --- a/cpp/src/Ice/Collector.cpp +++ b/cpp/src/Ice/Collector.cpp @@ -21,12 +21,12 @@ #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(); } @@ -566,17 +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 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 |