3 files changed, 11 insertions, 11 deletions
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index e6a0c920189..eb4b0e464d8 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -20,20 +20,21 @@ interruptHandler(DWORD)
 {
     assert(communicator);
     communicator->shutdown();
+    return TRUE;
 }
 
 static void
 shutdownOnInterrupt()
 {
-    BOOL b = SetConsoleHandler(interruptHandler, TRUE);
-    assert(b);
+    SetConsoleCtrlHandler(NULL, FALSE);
+    SetConsoleCtrlHandler(interruptHandler, TRUE);
 }
 
 static void
 ignoreInterrupt()
 {
-    BOOL b = SetConsoleHandler(interruptHandler, FASLSE);
-    assert(b);
+    SetConsoleCtrlHandler(NULL, TRUE);
+    SetConsoleCtrlHandler(interruptHandler, FALSE);
 }
 
 #else
@@ -83,8 +84,8 @@ using namespace std;
 int
 run(int argc, char* argv[], const DBEnvPtr& dbenv)
 {
-    ignoreInterrupt();
     cout << "starting up..." << endl;
+    ignoreInterrupt();
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapter("PhoneBookAdapter");
     DBPtr db = dbenv->open("phonebook");
@@ -114,8 +115,8 @@ run(int argc, char* argv[], const DBEnvPtr& dbenv)
 
     shutdownOnInterrupt();
     communicator->waitForShutdown();
-    ignoreInterrupt();
     cout << "shutting down..." << endl;
+    ignoreInterrupt();
 
     db->put("phonebook", phoneBook);
 
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index 367f89a5531..480efafa853 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -402,11 +402,10 @@ Freeze::DBEnvI::close()
 	return;
     }
 
-    for (map<string, DBPtr>::iterator p = _dbmap.begin(); p != _dbmap.end(); ++p)
+    while(!_dbmap.empty())
     {
-	p->second->close();
+	_dbmap.begin()->second->close();
     }
-    _dbmap.clear();
 
     int ret = _dbenv->close(_dbenv, 0);
     if(ret != 0)
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index d6ae8ca5796..4f3dd1b4e91 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\icepack001.* ..\..\lib
+PostBuild_Cmds=copy Release\freeze001.* ..\..\lib
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Freeze - Win32 Debug"
@@ -90,7 +90,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\icepack001d.* ..\..\lib
+PostBuild_Cmds=copy Debug\freeze001d.* ..\..\lib
 # End Special Build Tool
 
 !ENDIF