*** empty log message ***

2 files changed, 11 insertions, 1 deletions

diff --git a/ace/OS.i b/ace/OS.i
index ce7ad87e8de..f96744f06a4 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -6306,7 +6306,7 @@ ACE_OS::kill (pid_t pid, int signum)
 		   FALSE, // New handle is not inheritable.
 		   pid);
 
-  if (process_handle == ACE_INVALID_HANDLE)
+  if (process_handle == ACE_INVALID_HANDLE || process_handle == NULL)
     return -1;
   else
     {
diff --git a/ace/Process.i b/ace/Process.i
index 7e6372ceaaa..b45e624c7e7 100644
--- a/ace/Process.i
+++ b/ace/Process.i
@@ -23,7 +23,12 @@ ACE_Process::getpid (void)
 ACE_INLINE int
 ACE_Process::kill (int signum)
 {
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (signum);
+  return (int) ::TerminateProcess (this->process_info_.hProcess, 0);
+#else
   return ACE_OS::kill (this->getpid (), signum);
+#endif /* ACE_WIN32 */
 }
 
 // ************************************************************
@@ -41,7 +46,12 @@ ACE_Process_Old::getpid (void)
 ACE_INLINE int
 ACE_Process_Old::kill (int signum)
 {
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (signum);
+  return (int) ::TerminateProcess (this->process_info_.hProcess, 0);
+#else
   return ACE_OS::kill (this->getpid (), signum);
+#endif /* ACE_WIN32 */
 }
 
 // ************************************************************