diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-09-17 21:24:51 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-09-17 21:24:51 +0000 |
| commit | 77f2ff38b10a12f7189ab10dba239f7b53417986 (patch) | |
| tree | e203c24868f907dc8c3f8e5525e1c4c68aa308fb /cpp/src/IcePack/ActivatorI.cpp | |
| parent | Added support for --case-sensitive option (attribute casesensitive). (diff) | |
| download | ice-77f2ff38b10a12f7189ab10dba239f7b53417986.tar.bz2 ice-77f2ff38b10a12f7189ab10dba239f7b53417986.tar.xz ice-77f2ff38b10a12f7189ab10dba239f7b53417986.zip | |
Added ${parent} variable to get the name of the parent component.
Added attribute targets to server and service elements.
More clean up.
Diffstat (limited to 'cpp/src/IcePack/ActivatorI.cpp')
| -rw-r--r-- | cpp/src/IcePack/ActivatorI.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp index 8525e5eebeb..77bb18c6736 100644 --- a/cpp/src/IcePack/ActivatorI.cpp +++ b/cpp/src/IcePack/ActivatorI.cpp @@ -51,8 +51,9 @@ private: } -IcePack::ActivatorI::ActivatorI(const TraceLevelsPtr& traceLevels) : +IcePack::ActivatorI::ActivatorI(const TraceLevelsPtr& traceLevels, const PropertiesPtr& properties) : _traceLevels(traceLevels), + _properties(properties), _deactivating(false) { int fds[2]; @@ -126,7 +127,7 @@ IcePack::ActivatorI::activate(const ServerPtr& server) // // Compute arguments. // - int argc = server->description.theArgs.size() + 2; + int argc = server->description.theArgs.size() + 3; char** argv = static_cast<char**>(malloc(argc * sizeof(char*))); argv[0] = strdup(path.c_str()); unsigned int i = 0; @@ -135,6 +136,8 @@ IcePack::ActivatorI::activate(const ServerPtr& server) { argv[i + 1] = strdup(q->c_str()); } + string locatorArg = "--Ice.Default.Locator=" + _properties->getProperty("Ice.Default.Locator"); + argv[argc - 2] = strdup(locatorArg.c_str()); argv[argc - 1] = 0; if(_traceLevels->activator > 1) |