1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index f446ec69583..510e2b7c1ec 100755
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <Ice/EventLoggerI.h>
+#include <Ice/ImplicitContextI.h>
 
 extern "C" BOOL WINAPI _CRT_INIT(HINSTANCE, DWORD, LPVOID);
 
@@ -31,6 +32,10 @@ ice_DLL_Main(HINSTANCE hDLL, DWORD reason, LPVOID reserved)
     {
         Ice::EventLoggerI::setModuleHandle(hDLL);
     }
+    else if(reason == DLL_THREAD_DETACH)
+    {
+	Ice::ImplicitContextI::cleanupThread();
+    }
 
     return TRUE;
 }