summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-06 21:31:48 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-06 21:31:48 +0000
commitdbc553d0bb5031dc29e6276b1585f64df23c2419 (patch)
treecc6c009f3d7a541ab609bce5d915c76e75fab9eb
parent55b1cf9d6ebc66973c7fa6e847b7170560136c9c (diff)
downloadATCD-dbc553d0bb5031dc29e6276b1585f64df23c2419.tar.gz
Move deletion of svc_conf_file_queue_ to close method.
-rw-r--r--ace/Service_Config.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index a7e1c022785..cbadf539dc6 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -443,9 +443,6 @@ ACE_Service_Config::process_directives (void)
result += ACE_Service_Config::process_directives_i ();
}
}
-
- delete ACE_Service_Config::svc_conf_file_queue_;
- ACE_Service_Config::svc_conf_file_queue_ = 0;
}
return result;
@@ -723,6 +720,10 @@ ACE_Service_Config::close (void)
// Therefore, this call must go out here.
ACE_Service_Config::close_singletons ();
+ // Delete the list fo svc.conf files
+ delete ACE_Service_Config::svc_conf_file_queue_;
+ ACE_Service_Config::svc_conf_file_queue_ = 0;
+
// Delete the dynamically allocated static_svcs instance.
delete ACE_Service_Config::static_svcs_;
ACE_Service_Config::static_svcs_ = 0;