*** empty log message ***

2 files changed, 12 insertions, 12 deletions

diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 364224a47f1..7940f4b4828 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -793,10 +793,19 @@ class TAO_Export CORBA_ORB
   //   ORB pseudo-objref.
   //
   // = DESCRIPTION
+  //
   //   The "ORB" pseudo-object is used in bootstrapping, such as to
-  //   create object references from strings.  It's also used to
-  //   create strings from object references.
+  //   create object references from strings.  This class is intended
+  //   to be inherited by others, which will provide some more of the
+  //   CORBA support.  Implementations of this "CORBA::ORB" class must
+  //   know how to create stringify/destringify their objrefs, as well
+  //   as how to marshal and unmarshal them.
+  //
 public:
+  
+  // ORB_Core has special privileges
+  friend class TAO_ORB_Core;
+  
   static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
   // Return a duplicate of <{orb}>.  When work with this duplicate is
   // complete, it should be freed up using <CORBA::release()>.
@@ -925,12 +934,6 @@ public:
   // Establish connectsion to each of the comma-separated
   // <{host}>:<{port}> combinations specified in <connections>.
 
-  // @@ Irfan, I think this comment is in the wrong place!
-  // This class is intended to be inherited by others, which will
-  // provide some more of the CORBA support.  Implementations of this
-  // "CORBA::ORB" class must know how to create stringify/destringify
-  // their objrefs, as well as how to marshal and unmarshal them.
-
   int open (void);
   // Set up the ORB Core's acceptor to listen on the
   // previously-specified port for requests.  Returns -1 on failure,
@@ -948,9 +951,6 @@ public:
   virtual CORBA::ULong _incr_refcnt (void);
   virtual CORBA::ULong _decr_refcnt (void);
 
-  void _shutdown_lock (ACE_Lock *);
-  // Sets the pointer to our shutdown lock.
-
   TAO_Leader_Follower_Info &leader_follower_info (void);
   // Get access to the leader_follower_info
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index a0f25b4314c..fe375325944 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -491,7 +491,7 @@ TAO_ORB_Core::init (int& argc, char** argv)
   this_orb->_optimize_collocation_objects (this->opt_for_collocation_);
 
   // Set the <shutdown_lock_> for the ORB.
-  this_orb->_shutdown_lock (ssf->create_event_loop_lock ());
+  this_orb->shutdown_lock_ = ssf->create_event_loop_lock ();
 
   // @@ Michael: I don't know if this is the best spot,
   // we might have to discuss that.