Fixed bug in Naming_Loader related to instantiating the Naming_Server. Added

support to be able to instatiate a derived Naming_Server.

4 files changed, 40 insertions, 9 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 7e3c7171050..66bc094b6df 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,16 @@
+Mon Jan 28 22:20:12 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp:
+
+          Creates the Naming Server object if one is not passed in
+          as it did before. Allows user to pass in a derived
+          Naming Server if they wish to use it.
+
+        * utils/nslist/nslist.cpp:
+
+          Avoid warnings regarding conversions.
+
 Mon Jan 28 22:22:09 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * tests/Storable/run_test.pl:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index ac9a1477843..72b836a1c9f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -21,10 +21,15 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Naming_Loader::TAO_Naming_Loader (void)
-: naming_server_(0)
+TAO_Naming_Loader::TAO_Naming_Loader (TAO_Naming_Server *server)
+: naming_server_(server)
 {
   // Constructor
+
+  // If no server was provided, then we will construct one of the
+  // base class type.
+  if (naming_server_ == 0)
+    ACE_NEW (naming_server_, TAO_Naming_Server);
 }
 
 TAO_Naming_Loader::~TAO_Naming_Loader (void)
@@ -72,10 +77,20 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc,
                                   ACE_TCHAR *argv[])
 {
-  // Initializes the Naming Service. Returns -1
-  // on an error.
-  if (this->naming_server_->init_with_orb (argc, argv, orb) == -1)
-    return CORBA::Object::_nil ();
+
+  if (this->naming_server_ == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("TAO_Naming_Loader::create_object - naming_server_ ")
+                  ACE_TEXT ("never set.\n")));
+    }
+  else
+    {
+      // Initializes the Naming Service. Returns -1
+      // on an error.
+      if (this->naming_server_->init_with_orb (argc, argv, orb) == -1)
+        return CORBA::Object::_nil ();
+    }
 
   return CORBA::Object::_nil ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index baecae46c05..c5bb1016bee 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -33,7 +33,10 @@ class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader
 public:
 
   /// Constructor
-  TAO_Naming_Loader (void);
+  /// By default will use the standard Naming_Server.  If a server is provided
+  /// it will use that one instead. This object takes ownership of the provided
+  /// Naming Server.
+  TAO_Naming_Loader (TAO_Naming_Server *server = 0);
 
   /// Destructor
   ~TAO_Naming_Loader (void);
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 66a66d8e934..1633680618d 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -41,8 +41,8 @@ namespace
   const char
     *myTree = "|",      // Default string to draw tree "tram-lines"
     *myNode = "+";      // Default string to draw tree node end-points
-  size_t sizeMyTree;    // Initialised by main to strlen (myTree)
-  size_t sizeMyNode;    // Initialised by main to strlen (myNode)
+  int sizeMyTree;       // Initialised by main to strlen (myTree)
+  int sizeMyNode;       // Initialised by main to strlen (myNode)
   int maxDepth= 0;      // Limit to display depth (default unlimited)
   ACE_Time_Value
     rtt = ACE_Time_Value::zero; // relative roundtrip timeout for ctx