summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 44736086700..62865ac07fe 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -17,19 +17,21 @@
#include "ace/Dynamic_Service.h"
#include "ace/Argv_Type_Converter.h"
-
-
+#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Context_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Naming_Loader::TAO_Naming_Loader (void)
+: naming_server_(0)
{
// Constructor
}
TAO_Naming_Loader::~TAO_Naming_Loader (void)
{
- // Destructor
+ // Destroy the naming server that was created
+ delete naming_server_;
}
int
@@ -63,7 +65,7 @@ int
TAO_Naming_Loader::fini (void)
{
// Remove the Naming Service.
- return this->naming_server_.fini ();
+ return this->naming_server_->fini ();
}
CORBA::Object_ptr
@@ -73,7 +75,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
{
// Initializes the Naming Service. Returns -1
// on an error.
- if (this->naming_server_.init_with_orb (argc, argv, orb) == -1)
+ if (this->naming_server_->init_with_orb (argc, argv, orb) == -1)
return CORBA::Object::_nil ();
return CORBA::Object::_nil ();