1 files changed, 10 insertions, 17 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
index 93ffc86d1d3..1417dc041af 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
@@ -9,10 +9,11 @@ namespace CIAO
     // 
 
     PackagedComponentImplementation::
-    PackagedComponentImplementation ()
+    PackagedComponentImplementation (::XMLSchema::string< char > const& name__,
+    ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
     :
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()),
+    name_ (new ::XMLSchema::string< char > (name__)),
+    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
     regulator__ ()
     {
       name_->container (this);
@@ -397,14 +398,8 @@ namespace CIAO
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()),
-    regulator__ ()
+    :Base__ (e), regulator__ ()
     {
-      name_->container (this);
-      referencedImplementation_->container (this);
 
       ::XSCRT::Parser< char > p (e);
 
@@ -415,14 +410,14 @@ namespace CIAO
 
         if (n == "name")
         {
-          ::XMLSchema::string< char > t (e);
-          name (t);
+          name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
+          name_->container (this);
         }
 
         else if (n == "referencedImplementation")
         {
-          ::CIAO::Config_Handlers::ComponentImplementationDescription t (e);
-          referencedImplementation (t);
+          referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
+          referencedImplementation_->container (this);
         }
 
         else 
@@ -436,9 +431,7 @@ namespace CIAO
 
     ComponentPackageDescription::
     ComponentPackageDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
+    :Base__ (e), regulator__ ()
     {
 
       ::XSCRT::Parser< char > p (e);