--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp	Thu Jan 14 17:56:49 2010 +0300
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp	Wed Jan 20 01:33:49 2010 +0300
@@ -378,7 +378,9 @@
     TRY;
 
     AwtComponent * self = AwtComponent::GetComponentImpl(hWnd);
-    if (self == NULL || self->GetHWnd() != hWnd) {
+    if (self == NULL || self->GetHWnd() != hWnd ||
+        message == WM_UNDOCUMENTED_CLIENTSHUTDOWN) // handle log-off gracefully
+    {
         return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
     } else {
         return self->WindowProc(message, wParam, lParam);

--- a/jdk/src/windows/native/sun/windows/awtmsg.h	Thu Jan 14 17:56:49 2010 +0300
+++ b/jdk/src/windows/native/sun/windows/awtmsg.h	Wed Jan 20 01:33:49 2010 +0300
@@ -253,4 +253,8 @@
 #define WM_UNDOCUMENTED_CLICKMENUBAR 0x0313
 #endif
 
+#ifndef WM_UNDOCUMENTED_CLIENTSHUTDOWN
+#define WM_UNDOCUMENTED_CLIENTSHUTDOWN 0x003b
+#endif
+
 #endif  // AWTMSG_H