diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-01-05 15:03:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-01-05 15:03:03 +0100 |
| commit | 2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c (patch) | |
| tree | b179b72766a60db1a2fcb362089726793b5d9655 /cpp/src/IceGrid/NodeI.cpp | |
| parent | Bug 4538 - update instructions for building berkeley on windows (diff) | |
| download | ice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.tar.bz2 ice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.tar.xz ice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.zip | |
Fix for bug 4538 -- Freeze file lock is now stored in __Freeze subdirectory
Diffstat (limited to 'cpp/src/IceGrid/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 120df689b6a..ef71281b185 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -1262,7 +1262,6 @@ NodeI::canRemoveServerDirectory(const string& name) Ice::StringSeq c = readDirectory(_serversDir + "/" + name); set<string> contents(c.begin(), c.end()); contents.erase("dbs"); - contents.erase("dbs"); contents.erase("config"); contents.erase("distrib"); contents.erase("revision"); @@ -1288,6 +1287,7 @@ NodeI::canRemoveServerDirectory(const string& name) { Ice::StringSeq files = readDirectory(_serversDir + "/" + name + "/dbs/" + *p); files.erase(remove(files.begin(), files.end(), "DB_CONFIG"), files.end()); + files.erase(remove(files.begin(), files.end(), "__Freeze"), files.end()); if(!files.empty()) { return false; |