diff options
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index d585a11eb15..1075348e348 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -514,8 +514,7 @@ Activator::activate(const string& name, string::size_type pos = s.find('='); if(pos != string::npos) { - string key = s.substr(0, pos); - std::transform(key.begin(), key.end(), key.begin(), toupper); + string key = IceUtilInternal::toUpper(s.substr(0, pos)); envMap.insert(map<string, string>::value_type(key, s.substr(pos + 1))); } var += s.size(); @@ -528,8 +527,7 @@ Activator::activate(const string& name, string::size_type pos = s.find('='); if(pos != string::npos) { - string key = s.substr(0, pos); - std::transform(key.begin(), key.end(), key.begin(), toupper); + string key = IceUtilInternal::toUpper(s.substr(0, pos)); envMap.erase(key); envMap.insert(map<string, string>::value_type(key, s.substr(pos + 1))); } @@ -1005,6 +1003,13 @@ Activator::destroy() assert(_processes.empty()); } +bool +Activator::isActive() +{ + IceUtil::Monitor< IceUtil::Mutex>::Lock sync(*this); + return !_deactivating; +} + void Activator::runTerminationListener() { |