Sat May 29 17:23:05 1999 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 14 insertions, 39 deletions

diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index 4601b4af7c1..fda7534713c 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -218,9 +218,10 @@ TAO_UIOP_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
 
   response_required = request.response_expected ();
 
+#if !defined (TAO_NO_IOR_TABLE)
+
   const CORBA::Octet *object_key = request.object_key ().get_buffer ();
 
-#if !defined (TAO_NO_IOR_TABLE)
   if (ACE_OS::memcmp (object_key,
                       &TAO_POA::objectkey_prefix[0],
                       TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
@@ -255,7 +256,7 @@ TAO_UIOP_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
       ACE_THROW_RETURN (PortableServer::ForwardRequest (dup), -1);
     }
 
-#endif
+#endif /* TAO_NO_IOR_TABLE */
 
   // So, we read a request, now handle it using something more
   // primitive than a CORBA2 ServerRequest pseudo-object.
@@ -318,39 +319,6 @@ TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
   CORBA::Object_var forward_location_var;
   TAO_GIOP_LocateStatusType status;
 
-// #if !defined (TAO_NO_IOR_TABLE)
-//   if (ACE_OS::memcmp (tmp_key.get_buffer (),
-//                    &TAO_POA::objectkey_prefix[0],
-//                    TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) == 0)
-//     {
-//       ACE_DEBUG ((LM_DEBUG,
-//                "TAO Object Key Prefix found in the object key.\n"));
-
-
-//       // Do the Table Lookup. Raise a location forward exception or
-//       // a non-exist exception.
-
-//       // CORBA::Object_ptr object_reference;
-//       // int s =
-//       //     table->lookup (request.object_key (),
-//       //                    object_reference);
-//       // if (s == -1)
-//       //   {
-//       //      status = TAO_GIOP_UNKNOWN_OBJECT;
-//       //   }
-//       // else
-//       //   {
-//       //      status = TAO_GIOP_OBJECT_FORWARD;
-//       //      forward_location_var =
-//       //          CORBA::Object::_duplicate (object_reference);
-//       //    }
-//     }
-//   // else
-//   //   {
-// #endif
-
-  // this->handle_locate_i (....);
-
   GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
                                     response_required,
                                     tmp_key,
@@ -399,6 +367,9 @@ TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
     }
   else
     {
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
       // Try to narrow to ForwardRequest
       PortableServer::ForwardRequest_ptr forward_request_ptr =
         PortableServer::ForwardRequest::_narrow (env.exception ());
@@ -412,6 +383,9 @@ TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
                       "handle_locate has been called: forwarding\n"));
         }
       else
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
         {
           // Normal exception, so the object is not here
           status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -427,10 +401,6 @@ TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
       env.clear ();
     }
 
-#if !defined (TAO_NO_IOR_TABLE)
-  //  }
-#endif
-
   // Create the response.
   TAO_GIOP::start_message (TAO_GIOP::LocateReply, output,
                            this->orb_core_);
@@ -496,6 +466,8 @@ TAO_UIOP_Server_Connection_Handler::send_error (CORBA::ULong request_id,
           // Write the request ID
           output.write_ulong (request_id);
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
           // @@ TODO This is the place to conditionally compile
           // forwarding. It certainly seems easy to strategize too,
           // just invoke an strategy to finish marshalling the
@@ -522,6 +494,9 @@ TAO_UIOP_Server_Connection_Handler::send_error (CORBA::ULong request_id,
             }
           // end of the forwarding code ****************************
           else
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
             {
               // Write the exception
               CORBA::TypeCode_ptr except_tc = x->_type ();