From 62f57907d61dc31cb138782889be641982c0c6c1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 22 May 2007 12:41:20 +0000 Subject: Tue May 22 12:40:55 UTC 2007 Johnny Willemsen --- TAO/ChangeLog | 10 ++++++++++ TAO/tao/GIOP_Message_Generator_Parser_12.cpp | 28 +++------------------------- TAO/tao/RTCORBA/Thread_Pool.cpp | 10 +++------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8547de9d0d7..10333436f91 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue May 22 12:40:55 UTC 2007 Johnny Willemsen + + * tao/GIOP_Message_Generator_Parser.cpp (write_reply_header): + The service context can just be marshaled with the regular << + operator in all cases and added a check whether this succeeded + or not + + * tao/RTCORBA/Thread_Pool.cpp: + Layout changes + Mon May 21 12:36:55 UTC 2007 Johnny Willemsen * tests/AMI_Buffering/run_timeout_reactive.pl: diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 2854acd6de4..ce8f8f5b83e 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -138,33 +138,11 @@ TAO_GIOP_Message_Generator_Parser_12::write_reply_header ( } else { - this->marshal_reply_status (output, - reply); + this->marshal_reply_status (output, reply); } -#if (TAO_HAS_MINIMUM_CORBA == 1) - output << reply.service_context_notowned (); -#else - if (reply.is_dsi_ == false) - { - output << reply.service_context_notowned (); - } - else - { - IOP::ServiceContextList &svc_ctx = - reply.service_context_notowned (); - CORBA::ULong const l = svc_ctx.length (); - - // Now marshal the rest of the service context objects - output << l; - - for (CORBA::ULong i = 0; i != l; ++i) - { - output << svc_ctx[i]; - } - - } -#endif /*TAO_HAS_MINIMUM_CORBA */ + if (!(output << reply.service_context_notowned ())) + return false; if (reply.argument_flag_) { diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 5a37a0282e9..6622e014bad 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -286,8 +286,7 @@ TAO_Thread_Lane::open (void) bool ignore_address; // Get the endpoints for this lane. - params->get_endpoint_set (pool_lane_id, - endpoint_set); + params->get_endpoint_set (pool_lane_id, endpoint_set); if (endpoint_set.is_empty ()) { @@ -308,9 +307,7 @@ TAO_Thread_Lane::open (void) // Open the acceptor registry. int const result = - this->resources_.open_acceptor_registry (endpoint_set, - ignore_address - ); + this->resources_.open_acceptor_registry (endpoint_set, ignore_address); if (result == -1) throw ::CORBA::INTERNAL ( @@ -861,8 +858,7 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool) thread_pool->open (); // Create the static threads. - int result = - thread_pool->create_static_threads (); + int result = thread_pool->create_static_threads (); // Throw exception in case of errors. if (result != 0) -- cgit v1.2.1