diff options
author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-25 14:50:35 +0000 |
---|---|---|
committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-25 14:50:35 +0000 |
commit | e8d586bcbfce0796c32729f8234a74ca44a5a5c4 (patch) | |
tree | 356d769b03b841385f42657ccfeada07ce730320 /ace/DLL_Manager.cpp | |
parent | e63d4e617c903edc335ef8b246371e71f8d203f2 (diff) | |
download | ATCD-bug2612-ace.tar.gz |
ChangeLogTag: Fri Sep 22 21:02:58 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>bug2612-ace
Diffstat (limited to 'ace/DLL_Manager.cpp')
-rw-r--r-- | ace/DLL_Manager.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp index b796c4b6e55..0b4789bc8d3 100644 --- a/ace/DLL_Manager.cpp +++ b/ace/DLL_Manager.cpp @@ -223,9 +223,17 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, } ++this->refcount_; + + if (ACE::debug ()) + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"), + this->dll_name_, + this->handle_, + this->refcount_)); return 0; } + int ACE_DLL_Handle::close (int unload) { @@ -244,8 +252,7 @@ ACE_DLL_Handle::close (int unload) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close: ") - ACE_LIB_TEXT ("closing %s (%d), refcount is down to %d\n"), + ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close - %s (%d), refcount=%d\n"), this->dll_name_, this->handle_, this->refcount_)); @@ -265,9 +272,9 @@ ACE_DLL_Handle::close (int unload) ACE_Framework_Repository * frPtr= ACE_Framework_Repository::instance (); if (frPtr) - { - frPtr->remove_dll_components (this->dll_name_); - } + { + frPtr->remove_dll_components (this->dll_name_); + } retval = ACE_OS::dlclose (this->handle_); this->handle_ = ACE_SHLIB_INVALID_HANDLE; @@ -552,32 +559,32 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, ACE_DLL_Handle, 0); - dll_handle = temp_handle; + dll_handle = temp_handle; } } if (dll_handle) { if (dll_handle->open (dll_name, open_mode, handle) != 0) - { - // Error while openind dll. Free temp handle + { + // Error while openind dll. Free temp handle if (ACE::debug ()) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_DLL_Manager::open_dll: Could not ") ACE_LIB_TEXT ("open dll %s.\n"), dll_name)); - delete temp_handle; + delete temp_handle; return 0; } // Add the handle to the vector only if the dll is successfully // opened. if (temp_handle != NULL) - { - this->handle_vector_[this->current_size_] = dll_handle; + { + this->handle_vector_[this->current_size_] = dll_handle; this->current_size_++; - } + } } return dll_handle; |