diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-27 22:38:06 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-27 22:38:06 +0000 |
| commit | 94b2b5b58c972d67e29853abb2e16526605f5bbd (patch) | |
| tree | 6fe4593083542fc5c24f9962eb1e086e5c328c67 | |
| parent | 21e695285b2b1d899e3992edd1f4ac889880e83f (diff) | |
| download | ATCD-94b2b5b58c972d67e29853abb2e16526605f5bbd.tar.gz | |
(fini): added check of instance_->shutting_down_ on entry.
| -rw-r--r-- | ace/Object_Manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 9eff218f31e..67dc50b614d 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -256,7 +256,7 @@ ACE_Object_Manager::init (void) int ACE_Object_Manager::fini (void) { - if (instance_ == 0) + if (instance_ == 0 || instance_->shutting_down_ == 1) // Too late. Or, maybe too early. Either fini () has already // been called, or init () was never called. return -1; |