ChangeLogTag:Tue Nov 11 17:25:10 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

2 files changed, 11 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ec8a02eff7..d50332d9c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Nov 11 17:25:10 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* ace/TSS_T.cpp:
+
+	  Reverting the change "Mon Nov 10 22:30:14 2003  Kobi Cohen-Arazi
+	  <kobi@mivzak.com>". The change is so benign that the probelm is
+	  elsewhere. Thic change just triggered something else. Reverting
+	  this since our daily builds can run properly.
+
 Tue Nov 11 12:20:14 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index 104a2a8f6c3..c2cb22847c0 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -176,14 +176,8 @@ template <class TYPE> TYPE *
 ACE_TSS<TYPE>::ts_get (void) const
 {
   if (this->once_ == 0)
-  {
     // Create and initialize thread-specific ts_obj.
-      if(this->ts_init ()==-1)
-      {
-          return 0; // This should not happen!
-      }
-  }
-    
+    this->ts_init ();
 
   TYPE *ts_obj = 0;
 
@@ -292,13 +286,8 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
   // <ts_init> does it for us and we'll end up with deadlock
   // otherwise...
   if (this->once_ == 0)
-  {
     // Create and initialize thread-specific ts_obj.
-      if(this->ts_init ()==-1)
-      {
-          return 0;  // This should not happen!
-      }
-  }
+    this->ts_init ();
 
   // Ensure that we are serialized!
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);