summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-11-22 10:15:27 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-11-22 10:15:27 +0000
commit8537250d3a258b36769481c07fdcc4e3536ec1b4 (patch)
tree36bcf8709da66fa829fce9c217ffd8578bb8044a /cpp/src/IceGrid/ServerI.cpp
parentAdded --enable-new-dtags to Linux linker settings. (diff)
downloadice-8537250d3a258b36769481c07fdcc4e3536ec1b4.tar.bz2
ice-8537250d3a258b36769481c07fdcc4e3536ec1b4.tar.xz
ice-8537250d3a258b36769481c07fdcc4e3536ec1b4.zip
Fixed bug where the icegridnode could incorrect removed config files or db
env directories on update.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index d9c04eee6dd..d64e6bdd337 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -1328,7 +1328,8 @@ ServerI::updateImpl()
knownFiles.push_back("config_" + p->descriptor->name);
}
}
-
+ sort(knownFiles.begin(), knownFiles.end());
+
//
// Remove old configuration files.
//
@@ -1374,6 +1375,7 @@ ServerI::updateImpl()
}
}
}
+ sort(knownDbEnvs.begin(), knownDbEnvs.end());
//
// Remove old database environments.