1 files changed, 35 insertions, 24 deletions
diff --git a/DAnCE/TargetManager/DomainDataManager.cpp b/DAnCE/TargetManager/DomainDataManager.cpp
index 69ca5d6b9c7..663171c6981 100644
--- a/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/TargetManager/DomainDataManager.cpp
@@ -20,6 +20,17 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
   return global_data_manager_;
 }
 
+//static DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
+//                            ::Deployment::TargetManagerExt_ptr target
+//                            )
+//{
+//  if (global_data_manager_ == 0)
+//    {
+//      global_data_manager_ = new DomainDataManager (orb , target);
+//    }
+//  return global_data_manager_;
+//}
+
 // Returns the pointer to the static variable
 CIAO::DomainDataManager*
 CIAO::DomainDataManager::get_data_manager ()
@@ -27,7 +38,6 @@ CIAO::DomainDataManager::get_data_manager ()
   return global_data_manager_;
 }
 
-
 void
 CIAO::DomainDataManager::delete_data_manger ()
 {
@@ -35,6 +45,30 @@ CIAO::DomainDataManager::delete_data_manger ()
     delete global_data_manager_;
 }
 
+CIAO::DomainDataManager::
+DomainDataManager (CORBA::ORB_ptr orb,
+                   ::Deployment::TargetManager_ptr target)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    deployment_config_ (orb_.in()),
+    target_mgr_ (::Deployment::TargetManager::_duplicate(target))
+{
+  CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
+  ::Deployment::Domain* dmn = dd.domain_idl ();
+
+  if (CIAO::debug_level () > 9)
+    ::Deployment::DnC_Dump::dump (*dmn);
+
+  current_domain_ = *dmn;
+  initial_domain_ = current_domain_;
+
+  // initialize the provisioning domain
+  provisioned_data_ = initial_domain_;
+
+  update_node_status ();
+
+  call_all_node_managers ();
+}
+
 int CIAO::DomainDataManager::update_domain (
                              const ::CORBA::StringSeq &,
                              const ::Deployment::Domain & domainSubset,
@@ -88,29 +122,6 @@ int CIAO::DomainDataManager::update_domain (
   return 0;
 }
 
-CIAO::DomainDataManager::
-DomainDataManager (CORBA::ORB_ptr orb,
-                   ::Deployment::TargetManager_ptr target)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    deployment_config_ (orb_.in()),
-    target_mgr_ (::Deployment::TargetManager::_duplicate(target))
-{
-  CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
-  ::Deployment::Domain* dmn = dd.domain_idl ();
-
-  if (CIAO::debug_level () > 9)
-    ::Deployment::DnC_Dump::dump (*dmn);
-
-  current_domain_ = *dmn;
-  initial_domain_ = current_domain_;
-
-  // initialize the provisioning domain
-  provisioned_data_ = initial_domain_;
-
-  update_node_status ();
-
-  call_all_node_managers ();
-}
 
 ::Deployment::Domain* CIAO::DomainDataManager::get_current_domain ()
 {