summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionFactory.h
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-01-06 14:46:56 -0800
committerMark Spruiell <mes@zeroc.com>2012-01-06 14:46:56 -0800
commit82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa (patch)
tree9bd3e20e7e5d18ab0f3828c3047dccbf14632a83 /cpp/src/Ice/ConnectionFactory.h
parentICE-4471 Synchronization in Freeze MapI.java (diff)
downloadice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.tar.bz2
ice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.tar.xz
ice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.zip
ICE-4701 - AsyncResult::getCommunicator returns null
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.h')
-rw-r--r--cpp/src/Ice/ConnectionFactory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 31d5b47ad1e..c128579671e 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -12,6 +12,7 @@
#include <IceUtil/Mutex.h>
#include <IceUtil/Monitor.h>
+#include <Ice/CommunicatorF.h>
#include <Ice/ConnectionFactoryF.h>
#include <Ice/ConnectionI.h>
#include <Ice/InstanceF.h>
@@ -64,7 +65,7 @@ public:
private:
- OutgoingConnectionFactory(const InstancePtr&);
+ OutgoingConnectionFactory(const Ice::CommunicatorPtr&, const InstancePtr&);
virtual ~OutgoingConnectionFactory();
friend class Instance;
@@ -140,6 +141,7 @@ private:
void handleException(const Ice::LocalException&, bool);
void handleConnectionException(const Ice::LocalException&, bool);
+ Ice::CommunicatorPtr _communicator;
const InstancePtr _instance;
const ConnectionReaperPtr _reaper;
bool _destroyed;