*** empty log message ***

4 files changed, 58 insertions, 58 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 702705deb71..7621bbec850 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Mon Apr 21 23:44:34 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* IIOP/lib/roa.cpp (ROA): Changed spelling of clientAcceptor_ to
+ 	client_acceptor_ to be consistent with ACE style conventions.
+
 Mon Apr 21 10:52:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
 	* IIOP/test/clnt.cpp: Moved call to CORBA_ORB_init() prior to the
diff --git a/TAO/IIOP/lib/params.cpp b/TAO/IIOP/lib/params.cpp
index 85540e1a8f4..e14ff58752a 100644
--- a/TAO/IIOP/lib/params.cpp
+++ b/TAO/IIOP/lib/params.cpp
@@ -61,9 +61,7 @@ ROA_Factory::concurrency_strategy()
       concurrency_strategy_ = &threaded_strategy_;
     }
   else
-    {
-      concurrency_strategy_ = 0;
-    }
+    concurrency_strategy_ = 0;
 }
 
 
diff --git a/TAO/IIOP/lib/roa.cpp b/TAO/IIOP/lib/roa.cpp
index 495f377b771..28765ea1980 100644
--- a/TAO/IIOP/lib/roa.cpp
+++ b/TAO/IIOP/lib/roa.cpp
@@ -33,55 +33,55 @@ ROA::init (CORBA_ORB_ptr parent,
 	   ACE_INET_Addr& rendezvous,
 	   CORBA_Environment& env)
 {
-    env.clear ();
+  env.clear ();
 
-    //    ACE_MT(ACE_GUARD(ACE_Thread_Mutex, roa_mon, lock_));
+  //    ACE_MT(ACE_GUARD(ACE_Thread_Mutex, roa_mon, lock_));
 
-    if (ROA_Parameters::instance()->oa())
-      {
-	env.exception (new CORBA_INITIALIZE (COMPLETED_NO));
-	return 0;
-      }
+  if (ROA_Parameters::instance()->oa())
+    {
+      env.exception (new CORBA_INITIALIZE (COMPLETED_NO));
+      return 0;
+    }
 
 #if defined(ROA_NEED_REQ_KEY)
-    (void) ACE_Thread::keycreate(&req_key_);
+  (void) ACE_Thread::keycreate(&req_key_);
 #endif
     
-    // Don't know if this is right for what was originally being done.  Looks like
-    // what was set in thread_attr were flags given to pthread_create().  However,
-    // thread creation (when necessary) is now performed by the Svc_Handler::create().
-    //(void) ROA_Parameters::instance()->thread_flags(ROA_DEFAULT_THREADFLAGS);
+  // Don't know if this is right for what was originally being done.  Looks like
+  // what was set in thread_attr were flags given to pthread_create().  However,
+  // thread creation (when necessary) is now performed by the Svc_Handler::create().
+  //(void) ROA_Parameters::instance()->thread_flags(ROA_DEFAULT_THREADFLAGS);
 #if 0
 
-    //
-    // Initialize POSIX thread stuff:  TSD key for request data, and
-    // attributes for threads that can be dynamically created.
-    //
-    // XXX this stuff should be guarded by "pthread_once", it's not
-    // at all OA-specific.
-    //
-    (void) pthread_key_create (&request_key, 0);
+  //
+  // Initialize POSIX thread stuff:  TSD key for request data, and
+  // attributes for threads that can be dynamically created.
+  //
+  // XXX this stuff should be guarded by "pthread_once", it's not
+  // at all OA-specific.
+  //
+  (void) pthread_key_create (&request_key, 0);
 
-    (void) pthread_attr_init (&thread_attr);
-    (void) pthread_attr_setdetachstate (&thread_attr, PTHREAD_CREATE_DETACHED);
+  (void) pthread_attr_init (&thread_attr);
+  (void) pthread_attr_setdetachstate (&thread_attr, PTHREAD_CREATE_DETACHED);
 
 #ifdef	_POSIX_THREAD_PRIORITY_SCHEDULING
-    (void) pthread_attr_setscope (&thread_attr, PTHREAD_SCOPE_PROCESS);
+  (void) pthread_attr_setscope (&thread_attr, PTHREAD_SCOPE_PROCESS);
 #endif	// _POSIX_THREAD_PRIORITY_SCHEDULING
 
 #endif	// _POSIX_THREADS
 
-    ROA_ptr rp;
-    ACE_NEW_RETURN (rp, ROA(parent, rendezvous, env), 0);
-    ROA_Parameters::instance()->oa(rp);
+  ROA_ptr rp;
+  ACE_NEW_RETURN (rp, ROA(parent, rendezvous, env), 0);
+  ROA_Parameters::instance()->oa(rp);
 
-    return rp;
+  return rp;
 }
 
 
 ROA::ROA (CORBA_ORB_ptr owning_orb,
-		ACE_INET_Addr& rendezvous,
-		CORBA_Environment &env)
+	  ACE_INET_Addr& rendezvous,
+	  CORBA_Environment &env)
   : do_exit(CORBA_B_FALSE), 
     _orb(owning_orb),
     call_count(0),
@@ -95,22 +95,19 @@ ROA::ROA (CORBA_ORB_ptr owning_orb,
   //
   // Initialize the endpoint ... or try!
   //
-  if (clientAcceptor_.open(rendezvous,
-			   ACE_Service_Config::reactor(),
-			   f->creation_strategy(),
-			   f->accept_strategy(),
-			   f->concurrency_strategy(),
-			   f->scheduling_strategy()) == -1)
-    {
-      // XXXCJC Need to return an error somehow!!  Maybe set do_exit?
-    }
+  if (client_acceptor_.open(rendezvous,
+			    ACE_Service_Config::reactor(),
+			    f->creation_strategy(),
+			    f->accept_strategy(),
+			    f->concurrency_strategy(),
+			    f->scheduling_strategy()) == -1)
+    // XXXCJC Need to return an error somehow!!  Maybe set do_exit?
+    ;
 
-  clientAcceptor_.acceptor().get_local_addr(addr);
+  client_acceptor_.acceptor().get_local_addr(addr);
 
   if (env.exception () != 0)
-    {
-      p->oa(this);
-    }
+    p->oa(this);
 }
 
 ROA::~ROA ()
@@ -187,13 +184,12 @@ ROA::create (CORBA_OctetSeq& key,
   //
   // Return the CORBA_Object_ptr interface to this objref.
   //
-  CORBA_Object_ptr		new_obj;
+  CORBA_Object_ptr new_obj;
 
   if (data->QueryInterface (IID_CORBA_Object, (void**)&new_obj)
       != NOERROR)
-    {
-      env.exception (new CORBA_INTERNAL (COMPLETED_NO));
-    }
+    env.exception (new CORBA_INTERNAL (COMPLETED_NO));
+
   data->Release ();
   return new_obj;
 }
@@ -205,9 +201,9 @@ ROA::create (CORBA_OctetSeq& key,
 CORBA_OctetSeq *
 ROA::get_key(CORBA_Object_ptr, CORBA_Environment& env)
 {
-    // XXX implement me ! ... must have been created by this OA.
-    env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-    return 0;
+  // XXX implement me ! ... must have been created by this OA.
+  env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
+  return 0;
 }
 
 #if defined(ROA_NEED_REQ_KEY)
@@ -359,11 +355,12 @@ ROA::get_request (
     //
     // Here, some unthreaded app asked for thread support.  Ooops!
     //
-    if (do_thr_create) {
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      dexc (env, "TCP_OA, unthreaded: can't create worker threads");
-      return;
-    }
+    if (do_thr_create) 
+      {
+	env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
+	dexc (env, "TCP_OA, unthreaded: can't create worker threads");
+	return;
+      }
 
     //
     // Get a request/message ... if no file descriptor is returned,
diff --git a/TAO/IIOP/lib/roa.hh b/TAO/IIOP/lib/roa.hh
index 862b61a4e8f..4c43ad5fcf4 100644
--- a/TAO/IIOP/lib/roa.hh
+++ b/TAO/IIOP/lib/roa.hh
@@ -154,7 +154,7 @@ private:
 				// on which we're listening for
 				// connections and requests.
   CORBA_Boolean do_exit;	// Flag set by <clean_shutdown()>
-  ROA_Acceptor clientAcceptor_;	// The acceptor listening for requests.
+  ROA_Acceptor client_acceptor_;// The acceptor listening for requests.
   CORBA_ORB_ptr _orb;		// Pointer to our ORB.
 
   u_int call_count;		// Used by COM stuff