Minor style fixes in Acceptor_Registry.cpp

Statically load the UIOP protocol
If no protocols are selected by the user we insert IIOP to the
protocol list.

3 files changed, 19 insertions, 4 deletions

diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index b3f655ced0d..ab0d094cbb4 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -152,16 +152,18 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
           // Now get the list of avaliable protocol factories.
           TAO_ProtocolFactorySetItor end =
                           orb_core->protocol_factories ()->end ();
-          TAO_ProtocolFactorySetItor factory =
-                        orb_core->protocol_factories ()->begin ();
+          
 
-          for (TAO_Acceptor *acceptor = 0;
+          for (TAO_ProtocolFactorySetItor factory =
+                 orb_core->protocol_factories ()->begin ();
                factory != end;
                ++factory)
             {
               if ((*factory)->factory ()->match_prefix (prefix))
                 {
-                  if ((acceptor = (*factory)->factory ()->make_acceptor ()))
+                  TAO_Acceptor *acceptor =
+                    (*factory)->factory ()->make_acceptor ();
+                  if (acceptor != 0)
                     {
                       // add acceptor to list.
                       this->acceptors_.insert (acceptor);
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 76a95736859..d55c01cd2cb 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -8,6 +8,7 @@
 #include "tao/default_client.h"
 #include "tao/default_resource.h"
 #include "tao/IIOP_Factory.h"
+#include "tao/UIOP_Factory.h"
 
 ACE_RCSID(tao, TAO_Internal, "$Id$")
 
@@ -50,6 +51,8 @@ TAO_Internal::open_services (int& argc, char** argv, int ignore_default_svc_conf
         insert (&ace_svc_desc_TAO_Default_Server_Strategy_Factory);
       ACE_Service_Config::static_svcs ()->
         insert (&ace_svc_desc_TAO_IIOP_Protocol_Factory);
+      ACE_Service_Config::static_svcs ()->
+        insert (&ace_svc_desc_TAO_UIOP_Protocol_Factory);
       // add descriptor to list of static objects.
 
       int retv = ACE_Service_Config::open (argc, argv,
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index ed5a985ab5e..eb7066d9598 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -206,6 +206,16 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
   TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
   TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
 
+  if (factory == end)
+    {
+      TAO_Protocol_Item *item =
+        new TAO_Protocol_Item ("IIOP_Factory");
+      item->factory (
+          ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory"));
+      this->protocol_factories_.insert (item);
+      return 0;
+    }
+
   for ( ; factory != end ; factory++)
     {
       const ACE_CString name = (*factory)->protocol_name ();