diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
| commit | ada25bad3511a359eb28cf48f018d6a42e166f10 (patch) | |
| tree | 430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /cpp/src/IceGrid/ServerI.cpp | |
| parent | Ruby 1.8 fix (diff) | |
| download | ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2 ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip | |
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r--[-rwxr-xr-x] | cpp/src/IceGrid/ServerI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 852c45c31f1..cc4dcf35145 100755..100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1480,7 +1480,7 @@ ServerI::adapterDeactivated(const string& id) Lock sync(*this); while(_state == ServerI::Activating) { - wait(); // Wait for activate() to set the state to WaitForActivation + wait(); // Wait for activate() to set the state to WaitForActivation } if((_state == Active || _state == WaitForActivation) && @@ -2547,11 +2547,11 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool update } - if(pw->pw_uid == 0 && - _node->getCommunicator()->getProperties()->getPropertyAsInt("IceGrid.Node.AllowRunningServersAsRoot") == 0) - { - throw "running server as `root' is not allowed"; - } + if(pw->pw_uid == 0 && + _node->getCommunicator()->getProperties()->getPropertyAsInt("IceGrid.Node.AllowRunningServersAsRoot") == 0) + { + throw "running server as `root' is not allowed"; + } if(update) { |