diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-25 19:59:59 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-25 19:59:59 +0000 |
| commit | 7fccfcc1fde5aa0ea1cf28d8f552e066472741e5 (patch) | |
| tree | 3bd67f62cef397ed9cf6cf9f537c8a2024b8dffe | |
| parent | 7908b50258e27a9cb8a46853349094f5dc367596 (diff) | |
| download | ATCD-7fccfcc1fde5aa0ea1cf28d8f552e066472741e5.tar.gz | |
ChangeLogTag: Thu Jan 25 19:56:33 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
146 files changed, 272 insertions, 412 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a7f3dc4315f..1d0b9655b1c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 25 19:56:33 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * *.cpp: + + Removed all of the ACE_PRINT_EXCEPTION macros. + Thu Jan 25 19:45:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp index 6ff60dc630d..991719cbddf 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp @@ -150,8 +150,7 @@ main (int argc, char *argv[]) } catch (CORBA::Exception &ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp index fb8d809a5b1..020a0f332d1 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp @@ -205,8 +205,7 @@ main (int argc, char *argv[]) } catch (CORBA::Exception &ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } catch (...) diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index c7675ea2dc7..e4dc7055790 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -30,8 +30,8 @@ Base_Server::~Base_Server (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught while destroying Base_Server \n"); + ex._tao_print_exception ( + "Exception caught while destroying Base_Server \n"); } } @@ -129,8 +129,7 @@ Base_Server::start_orb_and_poa (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception raised initialising ORB or POA"); + ex._tao_print_exception ("Exception raised initialising ORB or POA"); return -1; } @@ -154,8 +153,7 @@ Base_Server::register_servant (AMH_Servant *servant) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception raised while registering servant"); + ex._tao_print_exception ("Exception raised while registering servant"); } } @@ -182,8 +180,8 @@ Base_Server::run_event_loop (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exceptionin Base_Server::run_event_loop"); + ex._tao_print_exception ( + "Caught exceptionin Base_Server::run_event_loop"); } } diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index 134c321bffd..8294feb2dba 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -105,8 +105,7 @@ Client_Task::narrow_servant (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught trying to narrow servant\n"); + ex._tao_print_exception ("Exception caught trying to narrow servant\n"); return 0; } return 1; diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 43e5cf1e96e..14fbfa282a2 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -149,8 +149,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index ab58822e80e..34c26812fda 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -127,8 +127,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } return 0; diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index b8e0b3db2e5..49b11d92cea 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -29,10 +29,10 @@ int main (int argc, char *argv[]) { - try + try { // Check arguments - if (argc != 2) + if (argc != 2) { cerr << "Usage: client IOR_string" << endl; throw 0; @@ -43,7 +43,7 @@ main (int argc, char *argv[]) // Destringify argv[1] CORBA::Object_var obj = orb->string_to_object (argv[1]); - if (CORBA::is_nil (obj.in ())) + if (CORBA::is_nil (obj.in ())) { cerr << "Nil Time reference" << endl; throw 0; @@ -52,7 +52,7 @@ main (int argc, char *argv[]) // Narrow Time_var tm = Time::_narrow (obj.in ()); - if (CORBA::is_nil (tm.in ())) + if (CORBA::is_nil (tm.in ())) { cerr << "Argument is not a Time reference" << endl; throw 0; @@ -71,14 +71,13 @@ main (int argc, char *argv[]) << setw (2) << setfill ('0') << tod.minute << ":" << setw (2) << setfill ('0') << tod.second << endl; } - catch (const CORBA::Exception &x) + catch (const CORBA::Exception &x) { - ACE_PRINT_EXCEPTION (x, - "Who is the culprit \n"); + x._tao_print_exception ("Who is the culprit \n"); cerr << "Uncaught CORBA exception" << endl; return 1; } - catch (...) + catch (...) { return 1; } diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index c3664408db6..7c49893a30a 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -88,8 +88,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index e87db223f9a..15375e78566 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -312,8 +312,7 @@ main (int argc, char **argv) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index d92466e7cc3..f30643ea98a 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -86,8 +86,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp index 5b611360b68..2c768647052 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp @@ -29,8 +29,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp index 5562761fc68..699e7a00dbe 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp @@ -27,8 +27,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception in main() for ServerApp"); + ex._tao_print_exception ("Caught exception in main() for ServerApp"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp index 845270e5994..41d9b635f30 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp @@ -28,8 +28,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp index 91f7bfeff83..1fa02daa71b 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp @@ -28,8 +28,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp index 01ef41fb163..34c9ba2b3d7 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp @@ -28,8 +28,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp index 21ae74637bd..6aa553483aa 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp @@ -26,8 +26,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index f4944886884..637f5b9b587 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -164,8 +164,7 @@ ClientTask::svc() } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception in ClientTask::svc():"); + ex._tao_print_exception ("Caught exception in ClientTask::svc():"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp index 5516b4d8ea5..ae4b26425fb 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp @@ -27,8 +27,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index 7860ffb889e..297e13a1b92 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -180,8 +180,7 @@ ClientTask::svc() } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception in ClientTask::svc:"); + ex._tao_print_exception ("Caught exception in ClientTask::svc:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp index 5b611360b68..2c768647052 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp @@ -29,8 +29,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp index 26d536e7118..48b765f3ebe 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp @@ -29,8 +29,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp index 5b611360b68..2c768647052 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp @@ -29,8 +29,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp index 26d536e7118..48b765f3ebe 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp @@ -29,8 +29,7 @@ main(int argc, char* argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } catch (...) { diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index 612ec059e58..d33f37fbf5d 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -69,8 +69,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Caught unexpected exception:")); + ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:")); return -1; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 7d814f02aae..1fd4ed054b7 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -96,9 +96,9 @@ Callback_Handler::next_chunk_excep } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Exception occured during ") - ACE_TEXT ("sendc_next_chunk() call:")); + ex._tao_print_exception ( + ACE_TEXT ("Exception occured during ") + ACE_TEXT ("sendc_next_chunk() call:")); } } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index 53adceb1505..c2c60adbecf 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -135,9 +135,9 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Caught unexpected exception ") - ACE_TEXT ("in Callback_i::metdata(...):")); + ex._tao_print_exception ( + ACE_TEXT ("Caught unexpected exception ") + ACE_TEXT ("in Callback_i::metdata(...):")); } } diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 08e0310c3f4..e3cc88d906e 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -67,8 +67,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Caught unexpected exception:")); + ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:")); return -1; } diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 48ae46a4652..14ea359f5af 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -69,8 +69,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Caught unexpected exception:")); + ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:")); return -1; } diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp index a3ac7378c5c..ed40e2a714f 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp @@ -74,8 +74,7 @@ Consumer_Handler::init (int argc, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Consumer_Handler::init\n"); + ex._tao_print_exception ("Consumer_Handler::init\n"); return -1; } @@ -108,8 +107,7 @@ Consumer_Handler::get_notifier (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Consumer_Handler::get_notifier\n"); + ex._tao_print_exception ("Consumer_Handler::get_notifier\n"); return -1; } diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp index dc528072aa1..f6ce490ee8c 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp @@ -58,8 +58,7 @@ Consumer_Input_Handler::close (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Consumer_Input_Handler::handle_close\n"); + ex._tao_print_exception ("Consumer_Input_Handler::handle_close\n"); } } diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index d59cc645157..50068489754 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -372,8 +372,7 @@ Notifier_i::push (const Event_Comm::Event &event) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception\n"); + ex._tao_print_exception ("Unexpected exception\n"); continue; } count++; diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp index ed928ca8d01..4df1cb9b4ac 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.cpp +++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp @@ -126,8 +126,7 @@ Notifier_Handler::init (int argc, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Notifier_Handler::init\n"); + ex._tao_print_exception ("Notifier_Handler::init\n"); return -1; } diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp index d2fe8321f33..0140ac2c9e3 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.cpp +++ b/TAO/examples/Event_Comm/Notifier_Server.cpp @@ -81,8 +81,7 @@ Notifier_Server::init_naming_service (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Notifier_Server::init_naming_service\n"); + ex._tao_print_exception ("Notifier_Server::init_naming_service\n"); return -1; } diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index 8e8c0bc5a65..5ed51496242 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -38,8 +38,7 @@ Notifier::Notifier (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Notifier_Server.init failed\n "); + ex._tao_print_exception ("Notifier_Server.init failed\n "); } // Register with the ORB's Reactor to receive a signal to shut us diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 32bda4c49a7..96589c1d2eb 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -256,8 +256,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index ec3f04051e3..679732de6a9 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -207,8 +207,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 11bd0f4b59d..f47fe54a5cf 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -250,8 +250,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index 67a475b0fd1..bf88cfd1083 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -207,8 +207,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 132dc89bd59..e6d676b39a0 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -316,8 +316,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index 04a344cd0ef..03c798b85f9 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -207,8 +207,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index e055f9ce487..2ed175d878d 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -93,7 +93,7 @@ Logger_Server::init (int argc, // and logger_factory object. int -Logger_Server::init_naming_service ( ACE_ENV_SINGLE_ARG_PARAMETER) +Logger_Server::init_naming_service () { // Get pointers to the ORB and child POA CORBA::ORB_var orb = this->orb_manager_.orb (); diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index d644541ca72..b4048168fa0 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -120,8 +120,7 @@ Server<Servant>::init (const char *servant_name, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception in activation of POA"); + ex._tao_print_exception ("Exception in activation of POA"); return -1; } diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp index 4cff4f09a42..d80786263f2 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -57,8 +57,7 @@ main (int argc, char **argv) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } return 0; diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 1c72df72f29..2e2aa70b5c8 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -101,8 +101,7 @@ int main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } @@ -177,8 +176,7 @@ Client::svc (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "MT_Client: exception raised"); + ex._tao_print_exception ("MT_Client: exception raised"); } return 0; } diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 360650d0396..cfb201d74ca 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -94,8 +94,7 @@ int main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index 0afbcd44956..85160bbc5e5 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -46,7 +46,6 @@ Simple_Server_i::shutdown (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } } diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 0b029abbeda..45f3787ef29 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -389,8 +389,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 125a97a175a..b8ee3b265c1 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -53,8 +53,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp index 189905b8a04..ebd1b42d228 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp @@ -93,8 +93,7 @@ FP_Task::pre_activate (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index a5595038bf5..c629a336669 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -218,8 +218,7 @@ DT_Test::svc (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } @@ -245,8 +244,7 @@ main (int argc, char* argv []) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp index 311c859ed96..9025497a5bb 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp @@ -61,8 +61,7 @@ MIF_DT_Creator::yield (int suspend_time, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index de4c4bd2851..c97affc9fbc 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -80,8 +80,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index dd66d2c7221..acbbb2b6caf 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -156,8 +156,7 @@ MIF_Task::perform_task (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 52a68f31c44..481540e1c45 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -116,8 +116,7 @@ DT_Test::svc (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } @@ -145,8 +144,7 @@ main (int argc, char* argv []) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 07c0440b68e..88296f3b815 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -134,8 +134,7 @@ main (int argc, char** argv) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } return 0; diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp index d5e40cd5948..22abb129d88 100644 --- a/TAO/examples/RTScheduling/Thread_Task.cpp +++ b/TAO/examples/RTScheduling/Thread_Task.cpp @@ -63,8 +63,7 @@ Thread_Task::svc (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } return 0; } diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index bcf46fa7eea..6a28a2ea93d 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -101,8 +101,7 @@ DOVE_Supplier::init (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DOVE_Supplier::init"); + ex._tao_print_exception ("DOVE_Supplier::init"); return -1; } @@ -375,8 +374,7 @@ DOVE_Supplier::get_EventChannel () } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DOVE_Supplier::get_EventChannel"); + ex._tao_print_exception ("DOVE_Supplier::get_EventChannel"); return -1; } @@ -446,8 +444,7 @@ DOVE_Supplier::connect_Supplier () } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DOVE_Supplier::connect_supplier"); + ex._tao_print_exception ("DOVE_Supplier::connect_supplier"); return -1; } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index e4fe992f90f..8385f709060 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -99,9 +99,9 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DualEC_Supplier::DualEC_Supplier : could " - "not resolve reference to terminator"); + ex._tao_print_exception ( + "DualEC_Supplier::DualEC_Supplier : could " + "not resolve reference to terminator"); } // Initialize the high priority RT_Info data @@ -154,8 +154,7 @@ DualEC_Supplier::~DualEC_Supplier () } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DualEC_Supplier::~DualEC_Supplier"); + ex._tao_print_exception ("DualEC_Supplier::~DualEC_Supplier"); } // @@TBD - destroy the ECs @@ -202,8 +201,7 @@ DualEC_Supplier::init () } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DualEC_Supplier::init"); + ex._tao_print_exception ("DualEC_Supplier::init"); return -1; } @@ -568,8 +566,7 @@ DualEC_Supplier::create_schedulers (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DualEC_Supplier::create_schedulers"); + ex._tao_print_exception ("DualEC_Supplier::create_schedulers"); return -1; } @@ -620,8 +617,7 @@ DualEC_Supplier::create_event_channels (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "DualEC_Supplier::create_event_channels"); + ex._tao_print_exception ("DualEC_Supplier::create_event_channels"); return -1; } diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index 891a5dadad7..bf1953fdf8b 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -103,8 +103,7 @@ int main(int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "exception:"); + ex._tao_print_exception ("exception:"); return 1; } diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index 2ce271401ff..5d7fdacb675 100644 --- a/TAO/examples/mfc/client.cpp +++ b/TAO/examples/mfc/client.cpp @@ -53,8 +53,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp index 133016367c6..85ea611d723 100644 --- a/TAO/examples/mfc/server.cpp +++ b/TAO/examples/mfc/server.cpp @@ -83,8 +83,7 @@ spawn_my_orb_thread (void *) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 0; } @@ -123,8 +122,7 @@ CServerApp::~CServerApp() } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index 820cd1ff934..99a2392ba3a 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -102,8 +102,7 @@ TAO_LB_run_load_manager (void * orb_arg) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "TAO Load Manager"); + ex._tao_print_exception ("TAO Load Manager"); return reinterpret_cast<void *> (-1); } @@ -268,8 +267,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "TAO Load Manager"); + ex._tao_print_exception ("TAO Load Manager"); return -1; } diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index a23edc1bbfc..d2f4003bb36 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -125,8 +125,7 @@ TAO_LB_run_load_monitor (void * orb_arg) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "TAO Load Monitor"); + ex._tao_print_exception ("TAO Load Monitor"); return reinterpret_cast<void *> (-1); } @@ -368,8 +367,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "TAO Load Monitor"); + ex._tao_print_exception ("TAO Load Monitor"); return -1; } diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp index 78dedf29364..1d333942057 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp @@ -32,8 +32,7 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception"); + ex._tao_print_exception ("Caught exception"); ACE_ERROR_RETURN ((LM_ERROR, "Problem during LoadMonitor cleanup " diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp index 45c866503ef..f63d8e11bc4 100644 --- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp @@ -44,8 +44,7 @@ TAO_LB_Push_Handler::handle_timeout ( // @@ Yah? if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ex, - "(%P|%t) Push_Handler::handle_timeout()\n"); + ex._tao_print_exception ("(%P|%t) Push_Handler::handle_timeout()\n"); } return 0; diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index cd1b29bc34c..bfa9e0956a7 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -127,8 +127,7 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception"); + ex._tao_print_exception ("Caught exception"); ACE_ERROR_RETURN ((LM_ERROR, "Problem during cleanup initiated by signal %d.\n", diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp index 5d5f6cf252d..bc99c5e9ed0 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp @@ -65,8 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Failed to start the Telecom Log Service.\n"); + ex._tao_print_exception ("Failed to start the Telecom Log Service.\n"); return 1; } diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp index 356385b9fc1..a4e95b568e4 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp @@ -67,8 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Failed to start the Telecom Log Service.\n"); + ex._tao_print_exception ("Failed to start the Telecom Log Service.\n"); return 1; } diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp index 63f52b56c03..db653aadbbb 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp @@ -65,8 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Failed to start the Telecom Log Service.\n"); + ex._tao_print_exception ("Failed to start the Telecom Log Service.\n"); return 1; } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp index b6a5154876b..d8abedffe36 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp @@ -68,8 +68,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Failed to start the Telecom Log Service.\n"); + ex._tao_print_exception ("Failed to start the Telecom Log Service.\n"); return 1; } diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp index 37a6e780994..aa652e311fe 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -68,8 +68,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("Failed to run the Notification Service\n")); + ex._tao_print_exception ( + ACE_TEXT ("Failed to run the Notification Service\n")); return 1; } diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index eebad3712a2..12c5d3a7f6a 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -279,8 +279,8 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("Unexpected exception in next_n_IORs\n")); + ex._tao_print_exception ( + ACE_TEXT ("Unexpected exception in next_n_IORs\n")); return -1; } @@ -390,8 +390,8 @@ Clerk_i::register_clerk (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("(%P|%t) Exception from init_naming_service ()\n")); + ex._tao_print_exception ( + ACE_TEXT ("(%P|%t) Exception from init_naming_service ()\n")); } return 0; @@ -471,8 +471,8 @@ Clerk_i::init (int argc, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("(%P|%t) Exception in Clerk_i::init ()\n")); + ex._tao_print_exception ( + ACE_TEXT ("(%P|%t) Exception in Clerk_i::init ()\n")); return -1; } @@ -494,8 +494,8 @@ Clerk_i::run (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("(%P|%t) Exception in Clerk_i::run ()\n")); + ex._tao_print_exception ( + ACE_TEXT ("(%P|%t) Exception in Clerk_i::run ()\n")); } return 0; diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index 626dc419c58..be7e2adfc7d 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -129,8 +129,8 @@ Server_i::create_server (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("Exception in Server_i::create_server ()")); + ex._tao_print_exception ( + ACE_TEXT ("Exception in Server_i::create_server ()")); return -1; } return 0; @@ -182,8 +182,8 @@ Server_i::register_server (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("(%P|%t) Exception from Register Server ()\n")); + ex._tao_print_exception ( + ACE_TEXT ("(%P|%t) Exception from Register Server ()\n")); return -1; } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 9a92f7672b7..46c4224eea9 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -211,8 +211,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index abe5e41242a..b5c1a01a4d9 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -117,8 +117,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp index 767eba855dd..c229a673084 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp @@ -95,8 +95,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception caught in client.cpp:"); + ex._tao_print_exception ("Exception caught in client.cpp:"); return 1; } diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 17b400165b5..84f89ecb79b 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -308,8 +308,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "lb_server exception"); + ex._tao_print_exception ("lb_server exception"); return 1; } diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp index 5c61b3bfc7f..67fc0001a77 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp @@ -134,8 +134,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected excpeption in PSS Test"); + ex._tao_print_exception ("Unexpected excpeption in PSS Test"); return -1; } diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp index 2c7925e15b2..a4193064877 100644 --- a/TAO/orbsvcs/examples/PSS/client.cpp +++ b/TAO/orbsvcs/examples/PSS/client.cpp @@ -80,8 +80,7 @@ int main (int argc, char *argv []) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Client raised an exception:\n"); + ex._tao_print_exception ("Client raised an exception:\n"); } return 0; diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp index 16a8c018a7c..4a1e4e042d3 100644 --- a/TAO/orbsvcs/examples/PSS/server.cpp +++ b/TAO/orbsvcs/examples/PSS/server.cpp @@ -79,8 +79,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected excpeption in PSS Test"); + ex._tao_print_exception ("Unexpected excpeption in PSS Test"); return -1; } diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 94fb7d414bc..921caee09c5 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -72,8 +72,7 @@ main (int argc, char *argv []) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 0d973055cf4..0286282ca72 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -74,8 +74,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index c456ac7cbe9..9dd9fd398e8 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -94,8 +94,7 @@ main (int argc, char *argv[]) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index c42a41a5603..2a2be14a536 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -230,8 +230,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev -/* ACE_ENV_SINGLE_ARG_PARAMETER */) + AVStreams::VDev_ptr &vdev) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -320,8 +319,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev -/* ACE_ENV_SINGLE_ARG_PARAMETER */) + AVStreams::VDev_ptr &vdev) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 54cbbfb999b..2a35c3b7c6c 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -33,8 +33,7 @@ CC_LockSet::CC_LockSet (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "CC_LockSet::CC_LockSet (void)"); + ex._tao_print_exception ("CC_LockSet::CC_LockSet (void)"); } } @@ -49,8 +48,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "CC_LockSet::CC_LockSet (...)"); + ex._tao_print_exception ("CC_LockSet::CC_LockSet (...)"); } } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index dcf671e5fcb..df98c3160d2 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -69,8 +69,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Concurrency Service"); + ex._tao_print_exception ("Concurrency Service"); return CORBA::Object::_nil (); } @@ -91,8 +90,7 @@ TAO_Concurrency_Server::fini (void) { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("TAO_Concurrency_Server")); + ex._tao_print_exception (ACE_TEXT ("TAO_Concurrency_Server")); } return -1; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 26231b016af..57673e79cf2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -338,8 +338,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () { // Ignore exceptions, we must isolate other clients from // problems on this one. - ACE_PRINT_EXCEPTION (ex, - "ProxySupplier::disconnect_pull_supplier"); + ex._tao_print_exception ("ProxySupplier::disconnect_pull_supplier"); } } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index cebad334dce..0ff1398ac9f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -315,8 +315,8 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist")); + ex._tao_print_exception ( + ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist")); // Ignore all exceptions.. } } @@ -331,8 +331,8 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist")); + ex._tao_print_exception ( + ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist")); // Ignore all exceptions.. } } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 4b96b917255..c83f99101e1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -23,8 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_IOGR_Property::set_property ( - CORBA::Object_ptr &ior - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + CORBA::Object_ptr &ior) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR)) { @@ -77,8 +76,7 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( - CORBA::Object_ptr ior - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + CORBA::Object_ptr ior) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 09d482511cb..002d747bd15 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -75,7 +75,7 @@ TAO_FixedDef_i::digits (void) } CORBA::UShort -TAO_FixedDef_i::digits_i ( /* ACE_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::digits_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index f0cf0016c9c..f216c345308 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -29,9 +29,9 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception in " - "EventLogFactory_i constructor."); + ex._tao_print_exception ( + "Caught exception in " + "EventLogFactory_i constructor."); } } diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index 442c931ff2a..1fe21850a99 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -65,9 +65,9 @@ TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger) catch (const CORBA::Exception& ex) { #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED) - ACE_PRINT_EXCEPTION (ex, - "TAO_Metrics_LocalCache::set_mission_state:" - " logger call failed\n"); + ex._tao_print_exception ( + "TAO_Metrics_LocalCache::set_mission_state:" + " logger call failed\n"); #endif } } @@ -116,8 +116,8 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str, catch (const CORBA::Exception& ex) { #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED) - ACE_PRINT_EXCEPTION (ex, - "TAO_Metrics_LocalCache::set_logger exception"); + ex._tao_print_exception ( + "TAO_Metrics_LocalCache::set_logger exception"); #endif return logger; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 439dea22c4e..7fe66e8294b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -44,8 +44,8 @@ TAO_PortableGroup_Loader::init (int /*argc*/, } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception caught while initializing the PortableGroup:"); + ex._tao_print_exception ( + "Unexpected exception caught while initializing the PortableGroup:"); return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index f1f4953377f..b7e6766557c 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -532,8 +532,7 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "TAO_PropertySet::is_type_allowed failed"); + ex._tao_print_exception ("TAO_PropertySet::is_type_allowed failed"); return ret_val; } } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index 745463b8574..b99b792b5dd 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -341,9 +341,9 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ex, - "There was an error constructing the " - "ClientScheduler Interceptor\n"); + ex._tao_print_exception ( + "There was an error constructing the " + "ClientScheduler Interceptor\n"); } } @@ -394,8 +394,7 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ex, - "Error in creating Client Interceptor\n"); + ex._tao_print_exception ("Error in creating Client Interceptor\n"); } } @@ -441,8 +440,7 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request ( } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "ERROR - in Client interceptor\n"); + ex._tao_print_exception ("ERROR - in Client interceptor\n"); throw CORBA::INTERNAL (); } } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index 232e1431c0c..9398bba6049 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -69,8 +69,7 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array, "Error in %s: Line %d - Could not generate a Locklist in shared memory\n", __FILE__, __LINE__)); - ACE_PRINT_EXCEPTION(ex, - "Exception: CosSchedulingLockList()"); + ex._tao_print_exception ("Exception: CosSchedulingLockList()"); } } @@ -336,8 +335,7 @@ PCP_Manager::lock(const int priority_ceiling, const int priority) "Error in %s: Line %d - Could lock resource\n" __FILE__, __LINE__)); - ACE_PRINT_EXCEPTION(ex, - "Exception: PCP_Manager::lock"); + ex._tao_print_exception ("Exception: PCP_Manager::lock"); } } @@ -376,8 +374,7 @@ void PCP_Manager::release_lock() "Error in %s: Line %d - Could not release lock\n" __FILE__, __LINE__)); - ACE_PRINT_EXCEPTION(ex, - "Exception: PCP_Manager::release_lock"); + ex._tao_print_exception ("Exception: PCP_Manager::release_lock"); } } @@ -484,8 +481,7 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file) "PCP_Manager_Factory to create new PCP_Managers\n" __FILE__, __LINE__)); - ACE_PRINT_EXCEPTION(ex, - "PCP_Manager_Factory::PCP_Manager_Factory\n"); + ex._tao_print_exception ("PCP_Manager_Factory::PCP_Manager_Factory\n"); } } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index 21bca24743c..5943a7f0e8a 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -254,8 +254,8 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ex, - "ERROR: Could not create a Scheduling Service POA\n"); + ex._tao_print_exception ( + "ERROR: Could not create a Scheduling Service POA\n"); return parent; } return parent; @@ -363,8 +363,8 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ex, - "Error in installing the interceptor for the ServerScheduler\n"); + ex._tao_print_exception ( + "Error in installing the interceptor for the ServerScheduler\n"); } } @@ -518,8 +518,7 @@ ACE_THROW_SPEC(( } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ex, - "Unknown exception in the receive request\n"); + ex._tao_print_exception ("Unknown exception in the receive request\n"); ACE_OS::exit(1); } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 34fd0988aef..3b78d4199ed 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -565,9 +565,8 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unable to register SSLIOP ORB " - "initializer."); + ex._tao_print_exception ( + "Unable to register SSLIOP ORB initializer."); return -1; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index f5d35fe32cd..48d87206164 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -40,9 +40,8 @@ TAO::SSLIOP::Util::current ( catch (const CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ex, - "Could not resolve " - "\"SSLIOPCurrent\" object"); + ex._tao_print_exception ( + "Could not resolve \"SSLIOPCurrent\" object"); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 8945b5067bc..90d8a330272 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -169,9 +169,9 @@ static_server (void) } catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ") - ACE_TEXT("cannot allocate server\n")); + ex._tao_print_exception ( + ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ") + ACE_TEXT("cannot allocate server\n")); } return server_; @@ -207,9 +207,9 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, catch (const CORBA::Exception& ex) { server_ = 0; - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT("ACE_Scheduler_Factory::use_config - ") - ACE_TEXT(" exception while resolving server\n")); + ex._tao_print_exception ( + ACE_TEXT("ACE_Scheduler_Factory::use_config - ") + ACE_TEXT(" exception while resolving server\n")); } status_ = ACE_Scheduler_Factory::CONFIG; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index cfdc4a541eb..657f66b3dec 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -78,8 +78,7 @@ TAO_Security_Current::init (void) catch (const CORBA::Exception& ex) { if (TAO_debug_level >= 1) - ACE_PRINT_EXCEPTION (ex, - "Could not initialize SecurityCurrent:"); + ex._tao_print_exception ("Could not initialize SecurityCurrent:"); result = -1; } diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index c51ad8c8627..af7d98e3e3f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -139,8 +139,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, catch (const CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ex, - "Exception in handle_timeout()\n"); + ex._tao_print_exception ("Exception in handle_timeout()\n"); return -1; } diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index 2e9a087808f..b1331a60f77 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void) } char* -Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Simple_Server_i::remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in())); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 4dfc4d3c0ed..bbe23477614 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Simple_Server_i::remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index 3b18b67811b..dc7f9f97136 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -22,7 +22,7 @@ Callback_i::shutdown (void) } void -Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 701d0cfebde..da30915c6a8 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -75,8 +75,7 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( - const CosNotification::StructuredEvent& event - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::StructuredEvent& event) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index 8db3752f153..3cb7e10ff34 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -57,8 +57,7 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( - const CosNotification::StructuredEvent& event - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::StructuredEvent& event) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp index bf73bb28e86..856843f7660 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp @@ -18,8 +18,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::push_structured_event ( - const CosNotification::StructuredEvent& /*event*/ - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::StructuredEvent& /*event*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index b7e195e7b23..5fb18be9cff 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -70,8 +70,7 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( - const CosNotification::EventBatch& events - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::EventBatch& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (count_ == 0) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 28d24e55e39..4ed908f305e 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -64,8 +64,7 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( - const CosNotification::StructuredEvent& event - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::StructuredEvent& event) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp index 219e33382b6..cc6a64df10a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp @@ -55,8 +55,7 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events( - const CosNotification::EventBatch& events - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::EventBatch& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->count_ == 0 ) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp index 4f96edaaa6c..31b8c3b6e0a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp @@ -49,8 +49,7 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event( - const CosNotification::StructuredEvent& /*event*/ - /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + const CosNotification::StructuredEvent& /*event*/) ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->count_ == 0 ) diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index e1f06c3ef6a..cac6e66f604 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -22,7 +22,7 @@ Callback_i::shutdown (void) } void -Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method () ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index e36f3dbf59f..c6c491c2911 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -56,8 +56,7 @@ Cubit_Server::parse_args (void) int Cubit_Server::init (int argc, - char** argv - ACE_ENV_SINGLE_ARG_PARAMETER) + char** argv) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp index 5c46e315f58..bdffc79c844 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp @@ -49,8 +49,7 @@ PP_Test_Server::parse_args (void) int PP_Test_Server::init (int argc, - char** argv - ACE_ENV_SINGLE_ARG_PARAMETER) + char** argv) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. @@ -96,7 +95,7 @@ PP_Test_Server::init (int argc, } int -PP_Test_Server::run ( ACE_ENV_SINGLE_ARG_PARAMETER) +PP_Test_Server::run () { int result = this->orb_manager_.run (); diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp index d5fdc3fa156..4c994050c98 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp @@ -21,8 +21,7 @@ Test_i::test_method (CORBA::Long id) } void -Test_i::shutdown (const char *orb_id - ACE_ENV_SINGLE_ARG_PARAMETER) +Test_i::shutdown (const char *orb_id) ACE_THROW_SPEC ((CORBA::SystemException)) { int argc = 0; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp index 0a9fc028860..361f6e0e653 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp @@ -42,7 +42,7 @@ Test_i::twoway_work_test (CORBA::ULong work) } void -Test_i::shutdown ( ACE_ENV_SINGLE_ARG_PARAMETER) +Test_i::shutdown () ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index 29ed3a524a9..34fb70d6e0e 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -48,8 +48,8 @@ TAO_Adapter_Registry::close (int wait_for_completion) { if (TAO_debug_level > 3) { - ACE_PRINT_EXCEPTION (ex, - "Exception in TAO_Adapter_Registry::close ()"); + ex._tao_print_exception ( + "Exception in TAO_Adapter_Registry::close ()"); } return; } diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index cba55b4c268..8b2da6f3919 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -55,8 +55,7 @@ TAO_BiDirGIOP_Loader::init (int, { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } return -1; } diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index def6fc8b362..b569936fffc 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -107,9 +107,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION ( - ex, - "FW_Server_Request_Wrapper::dispatch ()"); + ex._tao_print_exception ("FW_Server_Request_Wrapper::dispatch ()"); } } catch (...) @@ -149,9 +147,8 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION ( - exception, - "FW_Server_Request_Wrapper::dispatch ()"); + exception._tao_print_exception ( + "FW_Server_Request_Wrapper::dispatch ()"); } } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index fea436fdbc8..769a3bd5090 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -90,8 +90,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION (ex, - "Exception during reply handler"); + ex._tao_print_exception ("Exception during reply handler"); } } @@ -127,10 +126,8 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION ( - ex, - "DII_Deferred_Reply_Dispacher::connection_closed" - ); + ex._tao_print_exception ( + "DII_Deferred_Reply_Dispacher::connection_closed"); } } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp index 8c086788eae..6552490eaa7 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp @@ -42,8 +42,7 @@ TAO_EndpointPolicy_Initializer::init (void) { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } return -1; } diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 068b593b639..b7a0952feac 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -215,8 +215,8 @@ TAO_GIOP_Message_Base::generate_reply_header ( catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 4) - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header")); + ex._tao_print_exception ( + ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header")); return -1; } @@ -1068,9 +1068,8 @@ TAO_GIOP_Message_Base::process_request ( ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_connector_request ()"))); - ACE_PRINT_EXCEPTION ( - ex, - "TAO_GIOP_Message_Base::process_request[1]"); + ex._tao_print_exception ( + "TAO_GIOP_Message_Base::process_request[1]"); } } @@ -1087,9 +1086,8 @@ TAO_GIOP_Message_Base::process_request ( ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION ( - ex, - "TAO_GIOP_Message_Base::process_request[2]"); + ex._tao_print_exception ( + "TAO_GIOP_Message_Base::process_request[2]"); } return result; @@ -1125,9 +1123,8 @@ TAO_GIOP_Message_Base::process_request ( ACE_TEXT ("%p: ") ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_request ()"))); - ACE_PRINT_EXCEPTION ( - exception, - "TAO_GIOP_Message_Base::process_request[3]"); + exception._tao_print_exception ( + "TAO_GIOP_Message_Base::process_request[3]"); } } } diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 508b0990ec2..12e666c5f2d 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -839,9 +839,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_request ()"))); - ACE_PRINT_EXCEPTION ( - ex, - "TAO_GIOP_Message_Lite::process_request[2]"); + ex._tao_print_exception ( + "TAO_GIOP_Message_Lite::process_request[2]"); } } @@ -858,8 +857,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION (ex, - "TAO: "); + ex._tao_print_exception ("TAO: "); } return result; @@ -899,9 +897,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, ACE_TEXT ("%p: ") ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_request ()"))); - ACE_PRINT_EXCEPTION ( - exception, - "TAO_GIOP_Message_Lite::process_request[3]"); + exception._tao_print_exception ( + "TAO_GIOP_Message_Lite::process_request[3]"); } } } diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 309af68f6ba..8d175bb9826 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -106,9 +106,9 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); } - ACE_PRINT_TAO_EXCEPTION (ex, - "Ignoring exception in " - "IORInterceptor::establish_components"); + ex._tao_print_exception ( + "Ignoring exception in " + "IORInterceptor::establish_components"); } } } diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index b4471afc2f7..175e0b6a867 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -192,8 +192,8 @@ namespace TAO } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "ImR_Client_Adapter_Impl::imr_notify_shutdown()"); + ex._tao_print_exception ( + "ImR_Client_Adapter_Impl::imr_notify_shutdown()"); // Ignore exceptions } diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 04712dc4ff8..6f34dd52d84 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -132,8 +132,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( catch ( ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) - ACE_PRINT_EXCEPTION (ex, - "Exception during reply handler"); + ex._tao_print_exception ("Exception during reply handler"); } } @@ -182,8 +181,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION (ex, - "Asynch_Reply_Dispacher::connection_closed"); + ex._tao_print_exception ( + "Asynch_Reply_Dispacher::connection_closed"); } } @@ -240,8 +239,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION (ex, - "Asynch_Reply_Dispacher::reply_timed_out"); + ex._tao_print_exception ("Asynch_Reply_Dispacher::reply_timed_out"); } } diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 7f2ff911244..1ffb963fb19 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -58,8 +58,7 @@ TAO_Messaging_Loader::init (int, { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } return -1; } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index b738dfb8c9d..b9eb4757dfa 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1363,8 +1363,7 @@ TAO_ORB_Core::fini (void) message += this->orbid_; message += "\n"; - ACE_PRINT_EXCEPTION (ex, - message.c_str ()); + ex._tao_print_exception (message.c_str ()); } // Wait for any server threads, ignoring any failures. @@ -3288,9 +3287,9 @@ TAO_ORB_Core::ior_interceptor_adapter (void) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Cannot initialize the " - "ior_interceptor_adapter \n"); + ex._tao_print_exception ( + "Cannot initialize the " + "ior_interceptor_adapter \n"); } } } @@ -3481,9 +3480,9 @@ TAO_ORB_Core::valuetype_adapter (void) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Cannot initialize the " - "valuetype_adapter \n"); + ex._tao_print_exception ( + "Cannot initialize the " + "valuetype_adapter \n"); } } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 3c109659ae8..d5e751b6933 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -784,10 +784,10 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("TAO - ERROR creating stub ") - ACE_TEXT ("object when demarshaling object ") - ACE_TEXT ("reference.")); + ex._tao_print_exception ( + ACE_TEXT ("TAO - ERROR creating stub ") + ACE_TEXT ("object when demarshaling object ") + ACE_TEXT ("reference.")); return; } @@ -906,10 +906,10 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("TAO - ERROR creating stub ") - ACE_TEXT ("object when demarshaling object ") - ACE_TEXT ("reference.\n")); + ex._tao_print_exception ( + ACE_TEXT ("TAO - ERROR creating stub ") + ACE_TEXT ("object when demarshaling object ") + ACE_TEXT ("reference.\n")); return 0; } diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 1f1b5b99a1d..c2725c18d9f 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -63,8 +63,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "(%P|%t) Caught exception:"); + ex._tao_print_exception ("(%P|%t) Caught exception:"); } return -1; } diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index cf87f7f623c..35e4022e65f 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -56,8 +56,7 @@ TAO_PI_Init::Initializer (void) { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "(%P | %t) Caught exception:"); + ex._tao_print_exception ("(%P | %t) Caught exception:"); } return -1; } diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index dfe55c526cc..8d587c11162 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -60,8 +60,7 @@ TAO_PI_Server_Loader::init (int, } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 1faa2a5a50d..1ec2b80722b 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -75,8 +75,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) catch ( ::CORBA::Exception& ex) { if (TAO_debug_level > 4) - ACE_PRINT_EXCEPTION (ex, - "TAO_Policy_Set::TAO_Policy_Set"); + ex._tao_print_exception ("TAO_Policy_Set::TAO_Policy_Set"); // "Try" to make this recoverable as we must have run out of memory. this->policy_list_.length (0); diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index 4083cbac027..e29eb94b753 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -78,7 +78,7 @@ namespace TAO catch (::CORBA::Exception&ex) { // Ignore exceptions - ACE_PRINT_EXCEPTION (ex, "TAO_POA::complete_destruction_i"); + ex._tao_print_exception ("TAO_POA::complete_destruction_i"); } } diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 5ccdbe5956e..b5f37deb69b 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -2439,9 +2439,9 @@ TAO_Root_POA::ORT_adapter_i (void) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "(%P|%t) Cannot initialize the " - "object_reference_template_adapter\n"); + ex._tao_print_exception ( + "(%P|%t) Cannot initialize the " + "object_reference_template_adapter\n"); } return this->ort_adapter_; diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 615edc27976..ac090ee3ce2 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -439,8 +439,8 @@ namespace TAO catch ( ::CORBA::Exception& ex) { // Ignore exceptions - ACE_PRINT_EXCEPTION (ex, - "TAO_POA::~complete_destruction_i"); + ex._tao_print_exception ( + "TAO_POA::~complete_destruction_i"); } this->poa_ = 0; diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index b9dcea41191..bf2c2700c29 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -517,9 +517,9 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl // just ignore these un-understood policies. if (TAO_debug_level >= 5) - ACE_PRINT_EXCEPTION(ex, - ACE_TEXT ("IOR contains ") - ACE_TEXT ("unsupported policies.")); + ex._tao_print_exception ( + ACE_TEXT ("IOR contains ") + ACE_TEXT ("unsupported policies.")); } } } diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index c0a882545cf..657243a34fb 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -179,9 +179,9 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception caught while " - "initializing the RTORB"); + ex._tao_print_exception ( + "Unexpected exception caught while " + "initializing the RTORB"); return 1; } diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index efedbd7f13d..92fb8d082eb 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -454,8 +454,8 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) { if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "TAO_RT_Protocols_Hooks::get_dscp_codepoint"); + ex._tao_print_exception ( + "TAO_RT_Protocols_Hooks::get_dscp_codepoint"); } return -1; diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 288dae47503..ef9404012f7 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -66,8 +66,7 @@ TAO_Thread_Pool_Threads::svc (void) ACE_ERROR ((LM_ERROR, "orb->run() raised exception for thread %t\n")); - ACE_PRINT_EXCEPTION (ex, - ""); + ex._tao_print_exception (""); } return 0; diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 1ee8e7bbf92..7379cd8df3d 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -346,10 +346,10 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, catch ( ::CORBA::Exception& ex) { // Eat up the exception. - ACE_PRINT_EXCEPTION (ex, - "Exception caught: TAO - " - "Priority_Model_Processing::" - "~Priority_Model_Processing"); + ex._tao_print_exception ( + "Exception caught: TAO - " + "Priority_Model_Processing::" + "~Priority_Model_Processing"); } } } diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 7464667ee0c..42358836865 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -641,8 +641,7 @@ DTTask::svc (void) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index 996c9985d10..419a30d8468 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -58,8 +58,8 @@ TAO_RTScheduler_Loader::init (int, } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception caught while initializing the RTScheduler:"); + ex._tao_print_exception ( + "Unexpected exception caught while initializing the RTScheduler:"); return 1; } diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index c67d99f772d..29b878a9f17 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -115,8 +115,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } catch ( ::CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - name_); + ex._tao_print_exception (name_); result = -1; } return result; |