foo

6 files changed, 31 insertions, 19 deletions

diff --git a/ChangeLog-96b b/ChangeLog-96b
index 6fc4b3437c0..07cc44df712 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -1,13 +1,20 @@
+Mon Dec  2 14:13:44 1996  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tests/Naming_Test.cpp (main): Added delete ns_context to close
+ 	  things down and free up the semaphores.  Thanks to David Levine
+ 	  for suggesting this.
+
+	* examples/Reactor/Misc/test_demuxing.cpp (handle_input): Fixed a
+ 	  "typo" where we were accessing mb->msg_priority() *after*
+ 	  deleting it!  Thanks to Matthias for finding this.
+
 Mon Dec  2 09:57:15 1996  David L. Levine  <levine@cs.wustl.edu>
+
 	* tests/run_tests.*: updated lists of tests to be run
 
 	* tests/*.cpp: removed trailing .cpp from argument to
  	  ACE_START_TEST because it would appear in the log file name
 
-	* tests/SV_Shared_Memory_Test.cpp: moved ACE_END_TEST into
- 	  child process case, so that it gets called before returning
- 	  from main()
-
 Mon Dec  2 00:08:51 1996  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
 
 	* ace/Log_Record.cpp (dump): There was an error on line 19 of
diff --git a/README b/README
index 493590f13cf..337fb4711c4 100644
--- a/README
+++ b/README
@@ -622,7 +622,7 @@ Alfred Keller <kellera@pop.eunet.ch>
 John Lu <johnlu@f1.telekurs.ch>
 James Mansion <james@wgold.demon.co.uk>
 Jesper S. M|ller <Jesper.Moller@ameridata.dk>
-Chris Lahey <clahey@ix.netcom.com>
+Chris Lahey <clahey@cccis.com>
 Michael R"uger <m_rueger@syscomp.de>
 Istvan Buki <istvan.buki@infoboard.be>
 Greg Wilson <gvwilson@vnet.ibm.com>
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 45f838530c5..5b9aa3c91fb 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -1101,9 +1101,14 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key,
   *key = ::TlsAlloc ();
 
   if (*key != ACE_SYSCALL_FAILED)
-    // Extract out the thread-specific table instance and stash away
-    // the key and destructor so that we can free it up later on...
-    return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
+    {
+      // if TlsAlloc succeeded, TlsSetValue also succeeds.
+      // ::TlsSetValue (*key, inst);
+
+      // Extract out the thread-specific table instance and stash away
+      // the key and destructor so that we can free it up later on...
+      return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
+    }
   else
     ACE_FAIL_RETURN (-1);
     /* NOTREACHED */
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index e6c89b77f80..cacac69f5e6 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -274,8 +274,8 @@ Message_Handler::handle_input (ACE_HANDLE)
     ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
   else
     {
-      delete mb;
       ACE_DEBUG ((LM_DEBUG, "(%t) priority = %d\n", mb->msg_priority ()));
+      delete mb;
     }
 
   return 0;
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index fbfbac23a8a..fcd948a2eb1 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -162,8 +162,9 @@ main (int argc, char *argv[])
   // since we don't care if the file doesn't exist.
   ACE_OS::unlink (temp_file);  
 
+  // Close things down and free up the semaphores.
+  delete ns_context;
+
   ACE_END_TEST;
   return 0;
 }
-
-
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index 6d73d96e4a4..594918ef216 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -108,20 +108,19 @@ main (int, char * /* argv */[])
       ACE_ERROR_RETURN ((LM_ERROR, "(%P) fork failed\n"), -1);
       /* NOTREACHED */
     case 0:
-      {
-        // Child.
-        ACE_LOG_MSG->sync ("SV_Shared_Memory_Test.cpp");
-        int retval = child (shm);
-        ACE_END_TEST;
-        return retval;
-      }
+      // Child.
+      ACE_LOG_MSG->sync ("SV_Shared_Memory_Test.cpp");
+      child (shm);
+      break;
     default:
-      return parent (shm);
+      parent (shm);
+      break;
     }
 #else
   ACE_ERROR ((LM_ERROR, 
 	      "SYSV IPC is not supported on this platform\n"));
 #endif /* ACE_HAS_SYSV_IPC */
+  ACE_END_TEST;
   return 0;
 }