diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-15 09:45:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-15 09:45:01 +0000 |
| commit | ca7a8db2c051b265520f777729726033ccb8a45f (patch) | |
| tree | b5285a380c711c0b47d06e856f7a7c1df4d7f4c1 | |
| parent | 4ec9c0798602dbbbdfa61ed52797527358a17d64 (diff) | |
| download | ATCD-ca7a8db2c051b265520f777729726033ccb8a45f.tar.gz | |
Mon Jan 15 09:44:10 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 32 |
2 files changed, 26 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9b95670024d..4b7a8a82b91 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 15 09:44:10 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ORB_Core.cpp: + Made debug statement dependent on debug level, it was now + printed alwasy + Sat Jan 13 14:31:10 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> * tests/AlternateIIOP/run_test.pl: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index bd4eeb28dbe..da5361b6da6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -219,7 +219,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) imr_endpoints_in_ior_ (1), typecode_factory_ (CORBA::Object::_nil ()), codec_factory_ (CORBA::Object::_nil ()), - compression_manager_ (CORBA::Object::_nil ()), + compression_manager_ (CORBA::Object::_nil ()), dynany_factory_ (CORBA::Object::_nil ()), ior_manip_factory_ (CORBA::Object::_nil ()), ior_table_ (CORBA::Object::_nil ()), @@ -1453,9 +1453,11 @@ TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_f { if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0) { - - ACE_DEBUG ((LM_WARNING, - "TAO (%P|%t) - Deleting old gui_resource_factory.\n")); + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Deleting old gui_resource_factory.\n")); + } delete TAO_TSS_Resources::instance ()->gui_resource_factory_; } @@ -3140,24 +3142,30 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) if (TOCSRi->connection_timeout_hook_ == 0) { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) setting primary hook\n"))); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("TAO (%P|%t) setting primary hook\n"))); + } TOCSRi->connection_timeout_hook_ = hook; } else if (TOCSRi->connection_timeout_hook_ != hook && TOCSRi->alt_connection_timeout_hook_ == 0) { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) setting alternate hook\n"))); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("TAO (%P|%t) setting alternate hook\n"))); + } TOCSRi->alt_connection_timeout_hook_ = hook; } else if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) not overwriting alternate hook.") - ACE_TEXT (" Is it still null? %d\n"), - TOCSRi->alt_connection_timeout_hook_ == 0)); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) not overwriting alternate hook.") + ACE_TEXT (" Is it still null? %d\n"), + TOCSRi->alt_connection_timeout_hook_ == 0)); + } #undef TOCSRi } |