summaryrefslogtreecommitdiff
path: root/cppe/include/IceE/ObjectAdapter.h
diff options
context:
space:
mode:
Diffstat (limited to 'cppe/include/IceE/ObjectAdapter.h')
-rwxr-xr-xcppe/include/IceE/ObjectAdapter.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h
index c3c480b0252..46e73596211 100755
--- a/cppe/include/IceE/ObjectAdapter.h
+++ b/cppe/include/IceE/ObjectAdapter.h
@@ -104,13 +104,16 @@ private:
void checkForDeactivation() const;
static void checkIdentity(const Identity&);
std::vector<IceInternal::EndpointPtr> parseEndpoints(const std::string&) const;
+#ifdef ICEE_HAS_LOCATOR
+ void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&);
+#endif
bool _deactivated;
IceInternal::InstancePtr _instance;
CommunicatorPtr _communicator;
IceInternal::ObjectAdapterFactoryPtr _objectAdapterFactory;
IceInternal::ServantManagerPtr _servantManager;
- bool _printAdapterReadyDone;
+ bool _activateOneOffDone;
const std::string _name;
#ifdef ICEE_HAS_LOCATOR
const std::string _id;
@@ -126,6 +129,7 @@ private:
IceInternal::LocatorInfoPtr _locatorInfo;
#endif
int _directCount; // The number of direct proxies dispatching on this object adapter.
+ bool _waitForActivate;
bool _waitForDeactivate;
};