Modified the _dispatch functions of the skeletons so that it just calls

synchronous_upcall_dispatch.

6 files changed, 36 insertions, 139 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 6bbeed2a888..1ce13941bc1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,25 @@
+Sat Jul  8 17:45:00 2000  Bruce Trask  <brucetrask@aol.com>
+
+      * tao/DomainS.cpp:
+        Changed all _dispatch functions in skeletons to call
+        synchronous_upcall_dispatch function. 
+ 
+      * tao/ImplRepoS.cpp:
+        Changed all _dispatch functions in skeletons to call
+        synchronous_upcall_dispatch function. 
+
+      * tao/MessagingS.cpp:
+        Changed all _dispatch functions in skeletons to call
+        synchronous_upcall_dispatch function. 
+
+      * tao/POAS.cpp:
+        Changed all _dispatch functions in skeletons to call
+        synchronous_upcall_dispatch function. 
+ 
+      * tao/PolicyS.cpp:
+        Changed all _dispatch functions in skeletons to call
+        synchronous_upcall_dispatch function.      
+
 Sat Jul  8 16:10:27 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* orbsvcs/IFR_Service/IFR_Service.dsp:
diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp
index fc8e3c7953e..3ab986271df 100644
--- a/TAO/tao/DomainS.cpp
+++ b/TAO/tao/DomainS.cpp
@@ -204,16 +204,7 @@ void* POA_CORBA::DomainManager::_downcast (
 
 void POA_CORBA::DomainManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
@@ -466,16 +457,7 @@ void* POA_CORBA::ConstructionPolicy::_downcast (
 
 void POA_CORBA::ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
diff --git a/TAO/tao/ImplRepoS.cpp b/TAO/tao/ImplRepoS.cpp
index 88037b37c0f..f3a4aece77e 100644
--- a/TAO/tao/ImplRepoS.cpp
+++ b/TAO/tao/ImplRepoS.cpp
@@ -404,16 +404,7 @@ if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerObject:
 
 void POA_ImplementationRepository::ServerObject::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const
@@ -1626,16 +1617,7 @@ if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/Administratio
 
 void POA_ImplementationRepository::Administration::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const
@@ -2418,16 +2400,7 @@ if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerInforma
 
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
index 9009588a760..e69e23e68ca 100644
--- a/TAO/tao/MessagingS.cpp
+++ b/TAO/tao/MessagingS.cpp
@@ -263,16 +263,7 @@ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/Messaging/ReplyHandler:1.0") =
 
 void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
 const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index bf21b9a1d1c..4dd092ed444 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -205,16 +205,7 @@ void* POA_PortableServer::ThreadPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -488,16 +479,7 @@ void* POA_PortableServer::LifespanPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -768,16 +750,7 @@ void* POA_PortableServer::IdUniquenessPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -1051,16 +1024,7 @@ void* POA_PortableServer::IdAssignmentPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -1335,16 +1299,7 @@ void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -1617,16 +1572,7 @@ void* POA_PortableServer::ServantRetentionPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -1899,16 +1845,7 @@ void* POA_PortableServer::RequestProcessingPolicy::_downcast (
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad operation <%s>\n"), opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index dbd2a47d92f..e9139a09287 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -219,15 +219,7 @@ void POA_CORBA::Policy::_non_existent_skel (
 
 void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-    {
-      ACE_THROW (CORBA_BAD_OPERATION ());
-    }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */