*** empty log message ***

5 files changed, 17 insertions, 69 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 4408bf0eb95..71e02ea60aa 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,12 +1,11 @@
 Sun Oct 12 15:38:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
 	* tao/client_factory: Gutted the client factory code related to
- 	  the Strategy_Connector so that it's either in the CORBA_ORB
- 	  class in orbobj.* or in the connect.*.
+ 	  the Strategy_Connector so that it's either in the TAO_Orb_Core.
 
 	* tao/default_client.h: Removed the connector() from the
  	  Default_Client_Factory entirely since it's all been put into the
- 	  CORBA_ORB now.
+ 	  TAO_ORB_Core now.
 
 	* tao/giop.cpp (start): Hacked up the code so that we extract our
  	  connector from thread-specific storage if we're using the
@@ -14,7 +13,7 @@ Sun Oct 12 15:38:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
  	  more cleverly in the ORB.
 
 	* tao/orbobj.h: Put an instance of the TAO_CONNECTOR into each
- 	  CORBA_ORB object so that we don't have to share these things
+ 	  TAO_ORB_Core object so that we don't have to share these things
  	  among all of the threads in a process, but instead can have them
  	  be located in thread-specific storage.
 
diff --git a/TAO/tao/giop.cpp b/TAO/tao/giop.cpp
index 35c71e25e38..bb2e8621d24 100644
--- a/TAO/tao/giop.cpp
+++ b/TAO/tao/giop.cpp
@@ -628,22 +628,10 @@ TAO_GIOP_Invocation::start (CORBA::Environment &env)
   CORBA::Object_ptr obj = 0;
 
   // Get a CORBA::Object_ptr from _data using <QueryInterface>.
- (void) this->data_->QueryInterface (IID_CORBA_Object, (void **) &obj);
-
-  // Get a pointer to the orb from the object
-  CORBA::ORB_ptr orb;
-
-#if (TAO_HAS_TSS_ORBCORE)
-  // Get the connector from thread-specific storage.
-  orb = TAO_ORB_Core_instance ()->orb ();
-  assert (orb == obj->orb ());
-#else
-  orb = obj->orb ();
-  // con = orb->client_factory ()->connector ();
-#endif /* 0 */
-
-  // Get a pointer to the client connector.
-  TAO_CONNECTOR *con = orb->connector ();
+  (void) this->data_->QueryInterface (IID_CORBA_Object, (void **) &obj);
+
+  // Get a pointer to the connector.
+  TAO_CONNECTOR *con = TAO_ORB_Core_instance ()->connector ();
 
   // Determine the object key and the address to which we'll need a
   // connection.
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
index 14f59076c75..904cf95d310 100644
--- a/TAO/tao/orbobj.cpp
+++ b/TAO/tao/orbobj.cpp
@@ -62,10 +62,10 @@ CORBA_ORB::~CORBA_ORB (void)
 {
   TAO_Internal::close_services ();
 
-  if (! client_factory_from_service_config_)
+  if (!this->client_factory_from_service_config_)
     delete client_factory_;
 
-  if (! server_factory_from_service_config_)
+  if (!this->server_factory_from_service_config_)
     delete server_factory_;
 
   // This assertion isn't valid because our ORB is a singleton
@@ -381,33 +381,22 @@ CORBA::ORB_init (int &argc,
   // Initialize the Service Configurator
   TAO_Internal::open_services (svc_config_argc, svc_config_argv);
 
-  // Open the <Strategy_Connector>.
-  this->connector_.open (TAO_ORB_Core_instance ()->reactor (),
-			 &this->null_creation_strategy_,
-			 &this->caching_connect_strategy_,
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-			 this->concurrency_strategy_ ()
-#else
-		   0
-#endif /* TAO_HAS_CLIENT_CONCURRENCY */
-		   );
-
   // Inititalize the "ORB" pseudo-object now.
-  IIOP_ORB_ptr the_orb = 0;
-  ACE_NEW_RETURN (the_orb, IIOP_ORB, 0);
+  IIOP_ORB_ptr this_orb = 0;
+  ACE_NEW_RETURN (this_orb, IIOP_ORB, 0);
 
   // Install the ORB * into the ORB Core instance.  Note that if we're
   // running with a "thread-per-rate" concurrency model this ORB *
   // will be located in thread-specific storage.
-  TAO_ORB_Core_instance ()->orb (the_orb);
+  TAO_ORB_Core_instance ()->orb (this_orb);
 
   // @@ Seems like the following should happen inside the ORB Core,
   // not at this level.  Do we really need this stuff?  What is the
   // alternative format (other than IOR)?  --cjc
-  the_orb->use_omg_ior_format (CORBA::Boolean (use_ior));
-  the_orb->params ()->addr (rendezvous);
+  this_orb->use_omg_ior_format (CORBA::Boolean (use_ior));
+  this_orb->params ()->addr (rendezvous);
   
-  return the_orb;
+  return this_orb;
 }
 
 void
diff --git a/TAO/tao/orbobj.h b/TAO/tao/orbobj.h
index 0c4f2fdb156..e6736929ca4 100644
--- a/TAO/tao/orbobj.h
+++ b/TAO/tao/orbobj.h
@@ -45,9 +45,9 @@ public:
   static CORBA::ORB_ptr _nil (void);
 
   virtual CORBA::Object_ptr string_to_object (CORBA::String str,
-                                             CORBA::Environment &env) = 0;
+					      CORBA::Environment &env) = 0;
   virtual CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                         CORBA::Environment &env) = 0;
+					  CORBA::Environment &env) = 0;
 
   // similar for TypeCodes and Anys ... to/from octet sequences
 
@@ -124,9 +124,6 @@ public:
   // previously-specified port for requests.  Returns -1 on failure,
   // else 0.
 
-  TAO_CONNECTOR *connector (void);
-  // Accessor that returns the connector.
-
 protected:
   CORBA_ORB (void);
   virtual ~CORBA_ORB (void);
@@ -159,25 +156,6 @@ private:
   TAO_ACCEPTOR peer_acceptor_;
   // The acceptor passively listening for connection requests.
 
-  TAO_CONNECTOR peer_connector_;
-  // The connector actively initiating connection requests.
-
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  // @@ Chris, shouldn't this always be "potentially" the case, even
-  // if a client didn't want to use it?
-  // @@ Yes, but we don't support this right now...
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-#endif /* TAO_HAS_CLIENT_CONCURRENCY */
-
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-  // This no-op creation strategy is necessary for using the
-  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
-
-  TAO_CACHED_CONNECT_STRATEGY caching_connect_strategy_;
-  // This connection strategy maintain a cache of preconnected
-  // <TAO_Client_Connection_Handler>s.  The goal is to reduce latency
-  // and locking overhead.
-
   // = NON-PROVIDED METHODS
   CORBA_ORB (const CORBA_ORB &);
   CORBA_ORB &operator= (const CORBA_ORB &);
diff --git a/TAO/tao/orbobj.i b/TAO/tao/orbobj.i
index 00898fa47ed..a68d5b9c671 100644
--- a/TAO/tao/orbobj.i
+++ b/TAO/tao/orbobj.i
@@ -62,9 +62,3 @@ CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
   return;
 }
 
-ACE_INLINE TAO_CONNECTOR *
-CORBA_ORB::connector (void)
-{
-  return &this->peer_connector_;
-}
-