diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
| commit | e47e08887c823824bfc36f102c065075737394b1 (patch) | |
| tree | dcbb175cb6ba3204ac55a06d61d28c488227ab4f /cpp/src/IceGrid/NodeI.cpp | |
| parent | Revert "4171 - Global namespace pollution" (diff) | |
| download | ice-e47e08887c823824bfc36f102c065075737394b1.tar.bz2 ice-e47e08887c823824bfc36f102c065075737394b1.tar.xz ice-e47e08887c823824bfc36f102c065075737394b1.zip | |
Revert "Changes for bug 3962 and 4714"
This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe.
Diffstat (limited to 'cpp/src/IceGrid/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index ae3f2bc43cf..bf4c17e72c7 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -8,9 +8,9 @@ // ********************************************************************** #include <IceUtil/Timer.h> -#include <IceUtil/FileUtil.h> #include <Ice/Ice.h> #include <IcePatch2/Util.h> +#include <IcePatch2/OS.h> #include <IcePatch2/ClientUtil.h> #include <IceGrid/NodeI.h> #include <IceGrid/Activator.h> @@ -1153,7 +1153,8 @@ NodeI::removeServer(const ServerIPtr& server, const std::string& application) _serversByApplication.erase(p); string appDir = _dataDir + "/distrib/" + application; - if(IceUtilInternal::directoryExists(appDir)) + OS::structstat buf; + if(OS::osstat(appDir, &buf) != -1 && S_ISDIR(buf.st_mode)) { try { |