ChangeLogTag:Wed May 1 21:01:43 2002 Ossama Othman <ossama@uci.edu>

11 files changed, 54 insertions, 19 deletions

diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index e33e3a97ccd..736a31208fd 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -1,9 +1,12 @@
-// -*- C++ -*-
-// $Id$
-
 #include "Asynch_Queued_Message.h"
 
-ACE_RCSID(tao, Asynch_Queued_Message, "$Id$")
+#include "ace/Log_Msg.h"
+
+
+ACE_RCSID (tao,
+           Asynch_Queued_Message,
+           "$Id$")
+
 
 TAO_Asynch_Queued_Message::
     TAO_Asynch_Queued_Message (const ACE_Message_Block *contents)
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index d4bb023988e..50e06b17d94 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -1,14 +1,14 @@
-// -*- C++ -*-
-//
-// $Id$
-
 #include "Cleanup_Func_Registry.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Cleanup_Func_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, Cleanup_Func_Registry, "$Id$")
+#include "ace/Log_Msg.h"
+
+ACE_RCSID (tao,
+           Cleanup_Func_Registry,
+           "$Id$")
 
 TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
   : cleanup_funcs_ ()
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 4e4adfa7a96..e0307b75330 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Synch_T.h"
+
+
 /**
  * @class TAO_Endpoint
  *
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index c380d0ba644..50afe27d054 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1082,7 +1082,7 @@ TAO_ORB_Core::fini (void)
     {
       // Shutdown the ORB and block until the shutdown is complete.
       this->shutdown (1
-                       ACE_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1126,7 +1126,18 @@ TAO_ORB_Core::fini (void)
     }
 
   // Finalize lane resources.
-  this->thread_lane_resources_manager ().finalize ();
+  //
+  // @@ Do not call this->thread_lane_resources_manager().finalize().
+  // this->thread_lane_manager_resources() can seg fault if the
+  // factory method it invokes returns a zero pointer, which can
+  // easily occur if the ORB is partially initialized due to a Service
+  // Configurator initialization failure.  Instead check if the
+  // cached pointer is non-zero and then finalize.
+  //
+  // @todo Fix potential seg fault in
+  //       TAO_ORB_Core::thread_lane_resources_manager().
+  if (this->thread_lane_resources_manager_ != 0)
+    this->thread_lane_resources_manager_->finalize ();
 
   (void) TAO_Internal::close_services ();
 
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 9213e247775..0e318fd15b8 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "OctetSeqC.h"
+#include "ace/Synch_T.h"
 
 /**
  * @class CORBA_Principal
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 93b574f2a01..93a02a241d7 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,13 +6,15 @@
  *
  *  $Id$
  *
- *  @author Carlos O'Ryan and Aniruddha Gokhale
+ *  @author Carlos O'Ryan
+ *  @author Aniruddha Gokhale
  */
 //=============================================================================
 
 
 #ifndef TAO_SEQUENCE_H
 #define TAO_SEQUENCE_H
+
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -22,6 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Managed_Types.h"
+#include "ace/Log_Msg.h"        /* For "ACE_ASSERT" */
 
 class CORBA_Object;
 class CORBA_Environment;
@@ -651,4 +654,5 @@ TAO_Export int operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
 #include "tao/Sequence_T.h"
 
 #include "ace/post.h"
+
 #endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index f8a67b74d11..4b930afd63e 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,10 +13,15 @@
 
 #ifndef TAO_SEQUENCE_T_H
 #define TAO_SEQUENCE_T_H
+
 #include "ace/pre.h"
 
 #include "tao/Sequence.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /**
  * @class TAO_Unbounded_Sequence
  *
@@ -1385,4 +1390,5 @@ public:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
+
 #endif /* TAO_SEQUENCE_T_H */
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 8381449928d..ce7bd413d8a 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,9 +1,11 @@
-// -*- C++ -*-
-// $Id$
-
 #include "Synch_Queued_Message.h"
+#include "ace/Log_Msg.h"
+
+
+ACE_RCSID (tao,
+           Synch_Queued_Message,
+           "$Id$")
 
-ACE_RCSID(tao, Synch_Queued_Message, "$Id$")
 
 TAO_Synch_Queued_Message::
     TAO_Synch_Queued_Message (const ACE_Message_Block *contents)
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index bc038346759..53aea870e25 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Thread_Lane_Resources.h
@@ -19,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/corbafwd.h"
+#include "ace/Synch_T.h"
 
 class TAO_ORB_Core;
 class TAO_Acceptor_Registry;
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
index 4944dac56ea..6c9f323cb88 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/ValueBase.h
@@ -25,6 +25,7 @@
 #ifdef TAO_HAS_VALUETYPE
 
 #include "ace/OS.h"           /* for ptr_arith_t */
+#include "ace/Synch_T.h"
 #include "tao/corbafwd.h"
 
 /**
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
index 62499a07911..014db27bfc0 100644
--- a/TAO/tao/ValueFactory.h
+++ b/TAO/tao/ValueFactory.h
@@ -23,6 +23,7 @@
 
 #ifdef TAO_HAS_VALUETYPE
 
+#include "ace/Synch_T.h"
 
 class TAO_Export CORBA_ValueFactoryBase
 {