diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-09-07 16:14:20 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-09-07 16:14:20 +0000 |
| commit | 4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4 (patch) | |
| tree | 5b0d75ebdea90cbdfb6c3955b601ece88ccbceee /cppe/src/IceE/ObjectAdapter.cpp | |
| parent | Bug 371: closeSocket can hide real errors (diff) | |
| download | ice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.tar.bz2 ice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.tar.xz ice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.zip | |
revising fixes for bug 431
Diffstat (limited to 'cppe/src/IceE/ObjectAdapter.cpp')
| -rw-r--r-- | cppe/src/IceE/ObjectAdapter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp index 93068218ff5..724a7f2737e 100644 --- a/cppe/src/IceE/ObjectAdapter.cpp +++ b/cppe/src/IceE/ObjectAdapter.cpp @@ -604,7 +604,7 @@ Ice::ObjectAdapter::getServantManager() const } Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const CommunicatorPtr& communicator, - const string& name) : + const string& name, const string& endpointInfo) : _deactivated(false), _instance(instance), _communicator(communicator), @@ -623,8 +623,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato // The connection factory might change it, for example, to // fill in the real port number. // - string endpts = _instance->properties()->getProperty(name + ".Endpoints"); - vector<EndpointPtr> endpoints = parseEndpoints(endpts); + vector<EndpointPtr> endpoints = parseEndpoints(endpointInfo); for(vector<EndpointPtr>::iterator p = endpoints.begin(); p != endpoints.end(); ++p) { _incomingConnectionFactories.push_back(new IncomingConnectionFactory(_instance, *p, this)); @@ -634,7 +633,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato // Parse published endpoints. These are used in proxies // instead of the connection factory endpoints. // - endpts = _instance->properties()->getProperty(name + ".PublishedEndpoints"); + string endpts = _instance->properties()->getProperty(name + ".PublishedEndpoints"); _publishedEndpoints = parseEndpoints(endpts); #ifdef ICEE_HAS_ROUTER |