diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-07 12:18:42 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-07 12:18:42 -0230 |
| commit | 232fa424a7339659b6ad2cd02fbfe89420457601 (patch) | |
| tree | 978d9e9286c2915b771f8bea019276ab216eecc4 /cpp/src/Ice/CommunicatorI.cpp | |
| parent | Windows SSL SChannel implementation & OS X Secure Transport fixes. (diff) | |
| download | ice-232fa424a7339659b6ad2cd02fbfe89420457601.tar.bz2 ice-232fa424a7339659b6ad2cd02fbfe89420457601.tar.xz ice-232fa424a7339659b6ad2cd02fbfe89420457601.zip | |
ICE-5457 added ability to set source address for connections
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.cpp')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 57a04cc9435..fd7947d5dd2 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -36,12 +36,15 @@ using namespace IceInternal; void Ice::CommunicatorI::destroy() { - _instance->destroy(); + if(_instance) + { + _instance->destroy(); + } } void Ice::CommunicatorI::shutdown() -{ +{ _instance->objectAdapterFactory()->shutdown(); } @@ -223,7 +226,7 @@ Ice::CommunicatorI::begin_flushBatchRequests(const Callback_Communicator_flushBa } #ifdef ICE_CPP11 -AsyncResultPtr +AsyncResultPtr Ice::CommunicatorI::begin_flushBatchRequests( const IceInternal::Function<void (const Exception&)>& exception, const IceInternal::Function<void (bool)>& sent) @@ -232,14 +235,14 @@ Ice::CommunicatorI::begin_flushBatchRequests( { public: - + Cpp11CB(const IceInternal::Function<void (const Exception&)>& excb, const IceInternal::Function<void (bool)>& sentcb) : IceInternal::Cpp11FnCallbackNC(excb, sentcb) { CallbackBase::checkCallback(true, excb != nullptr); } - + virtual void completed(const AsyncResultPtr& __result) const { |