fixed ObjMan state logic to ensure that the ACE_Object_Manager is fini'd before the ACE_OS_Object_Manager

1 files changed, 2 insertions, 2 deletions

diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index cff66a9f4f6..a34d7ffb273 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -155,7 +155,7 @@ ACE_Object_Manager_Preallocations::~ACE_Object_Manager_Preallocations (void)
 int
 ACE_Object_Manager::init (void)
 {
-  if (object_manager_state_ < INITIALIZING_ACE_OBJ_MAN)
+  if (starting_up ())
     {
       // First, indicate that the ACE_Object_Manager instance is being
       // initialized.
@@ -223,7 +223,7 @@ ACE_Object_Manager::init (void)
 int
 ACE_Object_Manager::fini (void)
 {
-  if (instance_ == 0  || object_manager_state_ >= SHUTTING_DOWN_ACE_OBJ_MAN)
+  if (instance_ == 0  ||  shutting_down ())
     // Too late.  Or, maybe too early.  Either fini () has already
     // been called, or init () was never called.
     return -1;