ChangeLogTag:Thu Nov 4 12:50:23 1999 Darrell Brunsch <brunsch@cs.wustl.edu>

6 files changed, 37 insertions, 80 deletions

diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 270fb6d9a38..657d0963575 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -383,12 +383,6 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
         Currently the resources are limited to the reactor.
     </TD>
   </TR>
-  <TR>
-    <TD><CODE>-ORBMulticast</CODE> <EM>boolean (0|1)</EM></TD>
-    <TD><A NAME="-ORBMulticast"></a>Enable or disable Multicast use in
-	    resolve_initial_reference ().  By default, Multicast is enabled on
-		platforms that support it.</TD>
-  </TR>
 
 </TABLE>
 </P>
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 2cb55e07052..a2b61b9bdf8 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -467,68 +467,64 @@ CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
     "ImplRepoServicePort"
   };
 
-  u_short default_service_port [] =
-  {
-    TAO_DEFAULT_NAME_SERVER_REQUEST_PORT,
-    TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT,
-    TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT
-  };
+ u_short default_service_port [] =
+ {
+   TAO_DEFAULT_NAME_SERVER_REQUEST_PORT,
+   TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT,
+   TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT
+ };
+   
+ const char * service_objid [] =
+ {
+   TAO_OBJID_NAMESERVICE,
+   TAO_OBJID_TRADINGSERVICE,
+   TAO_OBJID_IMPLREPOSERVICE
+ };
  
-  const char * service_objid [] =
-  {
-    TAO_OBJID_NAMESERVICE,
-    TAO_OBJID_TRADINGSERVICE,
-    TAO_OBJID_IMPLREPOSERVICE
-  };
-
-  CORBA_Object_var return_value = CORBA_Object::_nil ();
-
-  // By now, the table filled in with -ORBInitRef arguments has been
-  // checked.  We only get here if the table didn't contain an initial
-  // reference for the requested Service.
-
-  // Check to see if the user has an environment variable.
-  ACE_CString service_ior = ACE_OS::getenv (env_service_ior[mcast_service_id]);
-
-  if (service_ior.length () != 0)
+ CORBA_Object_var return_value = CORBA_Object::_nil ();
+ 
+ // By now, the table filled in with -ORBInitRef arguments has been
+ // checked.  We only get here if the table didn't contain an initial
+ // reference for the requested Service.
+ 
+ // Check to see if the user has an environment variable.
+ ACE_CString service_ior = ACE_OS::getenv (env_service_ior[mcast_service_id]);
+ 
+ if (service_ior.length () != 0)
    {
      return_value =
        this->string_to_object (service_ior.c_str (),
                                ACE_TRY_ENV);
      ACE_CHECK_RETURN (CORBA_Object::_nil ());
    }
-  else
+ else
    {
      // First, determine if the port was supplied on the command line
      u_short port =
        this->orb_core_->orb_params ()->service_port (mcast_service_id);
-   
+     
      if (port == 0)
        {
          // Look for the port among our environment variables.
          const char *port_number =
            ACE_OS::getenv (env_service_port[mcast_service_id]);
-       
+         
          if (port_number != 0)
            port = (u_short) ACE_OS::atoi (port_number);
          else
            port = default_service_port[mcast_service_id];
        }
-   
-     // Find service with multicast.
-     if (this->orb_core_->orb_params ()->use_multicast ())
-     {
-       return_value =
-         this->multicast_to_service (service_objid[mcast_service_id],
-                                     port,
-                                     timeout,
-                                     ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_Object::_nil ());
-     }
+     
+     return_value =
+       this->multicast_to_service (service_objid[mcast_service_id],
+                                   port,
+                                   timeout,
+                                   ACE_TRY_ENV);
+     ACE_CHECK_RETURN (CORBA_Object::_nil ());
    }
-
-  // Return ior.
-  return return_value._retn ();
+ 
+ // Return ior.
+ return return_value._retn ();
 }
 
 int
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 061c0ca6964..f8b5dae89ef 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -256,9 +256,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   // Use TCP_NODELAY.
   size_t nodelay = 1;
 
-  // Use Multicast
-  size_t multicast = 1;
-
   // Should we skip the <ACE_Service_Config::open> method, e.g., if we
   // already being configured by the ACE Service Configurator.
   int skip_service_config_open = 0;
@@ -886,15 +883,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
           ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                ("-ORBMulticast")))
-        {
-          // Use Multicast or not.
-          multicast =
-            ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
 
       ////////////////////////////////////////////////////////////////
       // catch all the remaining -ORB args                          //
@@ -1096,7 +1084,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   this->orb_params ()->use_lite_protocol (giop_lite);
 
   this->orb_params ()->std_profile_components (std_profile_components);
-  this->orb_params ()->use_multicast (multicast);
 
   // Set up the pluggable protocol infrastructure.  First get a
   // pointer to the protocol factories set, then obtain pointers to
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 359fa6f70f1..26cf6d0d3fa 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -22,8 +22,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
     cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
     use_lite_protocol_ (0),
     use_dotted_decimal_addresses_ (0),
-    std_profile_components_ (1),
-    use_multicast_ (1)
+    std_profile_components_ (1)
 {
   for (int i=0; i<= NO_OF_MCAST_SERVICES; i++)
     this->service_port_[i] = 0;
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index e47b42e6dd9..02b67e32e83 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -175,11 +175,6 @@ public:
   // Disable the OMG standard profile components, useful for
   // homogenous environments.
 
-  int use_multicast (void) const;
-  void use_multicast (int um);
-  // Set/Get the flag for whether multicast should be used in 
-  // resolve_initial_references ().
-
 private:
   // Each "endpoint" is of the form:
   //
@@ -253,9 +248,6 @@ private:
 
   int std_profile_components_;
   // If true then the standard OMG components are not generated.
-
-  int use_multicast_;
-  // 1 if we want to use multicast, 0 if we want to suppress it.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 5e592bce09f..795cb20b4bd 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -171,14 +171,3 @@ TAO_ORB_Parameters::nodelay (int x)
   this->nodelay_ = x;
 }
 
-ACE_INLINE int
-TAO_ORB_Parameters::use_multicast (void) const
-{
-  return this->use_multicast_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::use_multicast (int um)
-{
-  this->use_multicast_ = um;
-}