From 14074ee9da0b65da0a35f70e6914f353bee91c4f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 23 Apr 2009 08:32:53 +0000 Subject: Thu Apr 23 09:31:37 UTC 2009 Johnny Willemsen * bin/tao_other_tests.lst: Added Bug_3646a_Regression * orbsvcs/Notify_Service/Notify_Service.cpp * orbsvcs/Notify_Service/Notify_Service.h Added support for multiple ChannelName arguments, the notification service will then create multiple channels and register them in the naming services * orbsvcs/tests/Notify/Bug_3646a_Regression * orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc * orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl New test for multiple ChannelName arguments * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp Initialise pointer with 0 * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp Const changes * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp * orbsvcs/tests/AVStreams/Latency/control.cpp * orbsvcs/tests/Bug_2247_Regression/Manager.cpp * orbsvcs/tests/Bug_2248_Regression/client.cpp * orbsvcs/tests/Bug_2926_Regression/DllORB.cpp * orbsvcs/tests/Bug_3598b_Regression/client.cpp * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp * orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp * orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp * orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp * orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp * orbsvcs/tests/Notify/lib/Notify_Test_Client.h * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp * orbsvcs/tests/Notify/MC/test_monitor.cpp * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp Removed not needed unicode to ascii conversion --- TAO/ChangeLog | 53 +++++++++++ TAO/bin/tao_other_tests.lst | 1 + .../Gateway_Service/FTRTEC_Gateway_Service.cpp | 2 +- TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 101 +++++++++++---------- TAO/orbsvcs/Notify_Service/Notify_Service.h | 6 +- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 2 +- .../orbsvcs/CosEvent/CEC_DynamicImplementation.cpp | 2 +- .../FT_ClientRequest_Interceptor.cpp | 8 +- .../RTEvent/Federated_Roundtrip/client.cpp | 2 +- TAO/orbsvcs/tests/AVStreams/Latency/control.cpp | 4 +- TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp | 4 +- TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp | 6 +- TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp | 2 - TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp | 2 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 4 +- .../tests/ImplRepo/Bug_689_Regression/client.cpp | 2 +- .../InterfaceRepo/Bug_3155_Regression/test_idl.cpp | 2 +- .../InterfaceRepo/Bug_3174_Regression/test_idl.cpp | 2 +- .../tests/Notify/Blocking/Structured_Consumer.cpp | 2 +- .../Bug_1385_Regression/Structured_Consumer.cpp | 2 +- .../tests/Notify/Bug_2561_Regression/Consumer.cpp | 2 +- .../Bug_3646a_Regression/Bug_3646a_Regression.mpc | 10 ++ .../tests/Notify/Bug_3646a_Regression/Consumer.cpp | 49 ++++++++++ .../tests/Notify/Bug_3646a_Regression/run_test.pl | 63 +++++++++++++ .../tests/Notify/Discarding/Sequence_Consumer.cpp | 2 +- .../Notify/Discarding/Structured_Consumer.cpp | 2 +- .../tests/Notify/MC/Structured_Consumer.cpp | 2 +- TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp | 2 +- .../Notify/MT_Dispatching/Structured_Consumer.cpp | 2 +- .../tests/Notify/Ordering/Sequence_Consumer.cpp | 2 +- .../tests/Notify/Ordering/Structured_Consumer.cpp | 2 +- .../Sequence_Consumer.cpp | 2 +- .../Sequence_Multi_Filter/Sequence_Consumer.cpp | 2 +- .../tests/Notify/lib/Notify_Test_Client.cpp | 11 +-- TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h | 2 +- .../performance-tests/Filter/Sequence_Consumer.cpp | 2 +- .../Filter/Structured_Consumer.cpp | 2 +- .../tests/tests_svc_loader/tests_svc_loader.cpp | 2 +- 38 files changed, 270 insertions(+), 100 deletions(-) create mode 100644 TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc create mode 100644 TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp create mode 100755 TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eb8fd4e4bb0..222ded63ecf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,56 @@ +Thu Apr 23 09:31:37 UTC 2009 Johnny Willemsen + + * bin/tao_other_tests.lst: + Added Bug_3646a_Regression + + * orbsvcs/Notify_Service/Notify_Service.cpp + * orbsvcs/Notify_Service/Notify_Service.h + Added support for multiple ChannelName arguments, the notification service + will then create multiple channels and register them in the naming services + + * orbsvcs/tests/Notify/Bug_3646a_Regression + * orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc + * orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp + * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl + New test for multiple ChannelName arguments + + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp + Initialise pointer with 0 + + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp + Const changes + + * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp + * orbsvcs/tests/AVStreams/Latency/control.cpp + * orbsvcs/tests/Bug_2247_Regression/Manager.cpp + * orbsvcs/tests/Bug_2248_Regression/client.cpp + * orbsvcs/tests/Bug_2926_Regression/DllORB.cpp + * orbsvcs/tests/Bug_3598b_Regression/client.cpp + * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp + * orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp + * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp + * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp + * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp + * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp + * orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp + * orbsvcs/tests/Notify/lib/Notify_Test_Client.h + * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp + * orbsvcs/tests/Notify/MC/test_monitor.cpp + * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp + * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp + * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp + Removed not needed unicode to ascii conversion + Thu Apr 23 07:18:37 UTC 2009 Johnny Willemsen * tests/FL_Cube/client.cpp diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 1a1b4123baf..47b21fad64b 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -150,6 +150,7 @@ TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl: !ST !NO_MESSAGING !MINIM TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl -p: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ +TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl -p: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ TAO/orbsvcs/tests/EC_Mcast/run_test.pl: !NO_MCAST !NO_MESSAGING !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !CORBA_E_MICRO !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ # NO REDIRECTION TAO/examples/Simple/echo/run_test.pl < Echo.idl !VxWorks !VxWorks_RTP !LabVIEW_RT !WinCE !FUZZ diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 35f280c4b30..42dc5aada48 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -36,7 +36,7 @@ int parse_args (int argc, ACE_TCHAR *argv[]) { case 'i': { - CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg ())); + CORBA::Object_var obj = orb->string_to_object (get_opt.opt_arg ()); ftec = FtRtecEventChannelAdmin::EventChannel::_narrow (obj.in()); } break; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 82ef3482818..e40f9af7200 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -26,14 +26,12 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void) , use_name_svc_ (true) , ior_output_file_ (0) , notify_factory_name_ (NOTIFY_KEY) -, notify_channel_name_ (NOTIFY_CHANNEL_NAME) , register_event_channel_ (false) , nthreads_ (1) , separate_dispatching_orb_ (false) , timeout_ (0) , logging_worker_(this) { - // No-Op. } TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void) @@ -132,7 +130,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (this->notify_service_ == 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Service not found. Check service ") ACE_TEXT ("configurator file.\n"))); return -1; @@ -156,8 +154,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (this->nthreads_ > 0) // we have chosen to run in a thread pool. { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Running %d ORB threads\n"), + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Running %d ORB threads\n"), this->nthreads_)); worker_.orb (this->orb_.in ()); @@ -181,7 +179,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (this->use_name_svc_) { // Resolve the naming service. - int ns_ret = this->resolve_naming_service (); + int const ns_ret = this->resolve_naming_service (); if (ns_ret != 0) return -1; @@ -204,6 +202,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in ()); + if (CORBA::is_nil (adapter.in ())) { ACE_ERROR ((LM_ERROR, @@ -217,7 +216,6 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) } } - // Register with the Name service, if asked if (this->use_name_svc_) { @@ -226,7 +224,6 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) CosNaming::Name_var name = this->naming_->to_name (this->notify_factory_name_.c_str ()); - this->naming_->rebind (name.in (), this->notify_factory_.in ()); @@ -236,38 +233,46 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (this->register_event_channel_) { - // create an event channel - CosNotifyChannelAdmin::ChannelID id; - - CosNotification::QoSProperties initial_qos; - CosNotification::AdminProperties initial_admin; - - CosNotifyChannelAdmin::EventChannel_var ec; - TAO_Notify_EventChannelFactory* factory_impl = - dynamic_cast ( - this->notify_factory_->_servant ()); - if (factory_impl == 0) + // If we don't have any name configured, default to the standard name + if (this->notify_channel_name_.is_empty ()) { - ec = this->notify_factory_->create_channel (initial_qos, - initial_admin, - id); + notify_channel_name_.insert (NOTIFY_CHANNEL_NAME); } - else + + for (ACE_Unbounded_Set::const_iterator ci ( + this->notify_channel_name_); !ci.done(); ci++) { - ec = factory_impl->create_named_channel ( - initial_qos, initial_admin,id, - this->notify_channel_name_.c_str ()); + // create an event channel + CosNotifyChannelAdmin::ChannelID id; + + CosNotification::QoSProperties initial_qos; + CosNotification::AdminProperties initial_admin; + + CosNotifyChannelAdmin::EventChannel_var ec; + TAO_Notify_EventChannelFactory* factory_impl = + dynamic_cast ( + this->notify_factory_->_servant ()); + if (factory_impl == 0) + { + ec = this->notify_factory_->create_channel (initial_qos, + initial_admin, + id); + } + else + { + ec = factory_impl->create_named_channel ( + initial_qos, initial_admin,id, + (*ci).c_str ()); + } + + name = this->naming_->to_name ((*ci).c_str ()); + + this->naming_->rebind (name.in (), ec.in ()); + + ACE_DEBUG ((LM_DEBUG, + "Registered an Event Channel with the naming service as: %C\n", + (*ci).c_str())); } - - name = this->naming_->to_name (this->notify_channel_name_.c_str ()); - - this->naming_->rebind (name.in (), - ec.in ()); - - ACE_DEBUG ((LM_DEBUG, - "Registered an Event Channel with the naming service as: %C\n", - this->notify_channel_name_.c_str())); - } } @@ -314,9 +319,9 @@ int TAO_Notify_Service_Driver::run (void) { if (TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s: Running the Notification Service\n"), - ACE_TEXT_CHAR_TO_TCHAR (__FILE__))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("%C: Running the Notification Service\n"), + __FILE__)); if (this->nthreads_ > 0) { @@ -431,7 +436,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) { - this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->notify_channel_name_.insert(ACE_CString(ACE_TEXT_ALWAYS_CHAR(current_arg))); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Channel")) == 0) @@ -443,7 +448,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor")))) { - ACE_DEBUG((LM_DEBUG, + ACE_DEBUG((LM_DEBUG, ACE_TEXT ("-Notify_TPReactor option is deprecated, ") ACE_TEXT ("use -ORBRunThreads option\n"))); @@ -516,7 +521,7 @@ LoggingWorker::start () { if (this->activate (THR_NEW_LWP | THR_JOINABLE, 1) == -1) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)can not activate the ") ACE_TEXT ("logging event thread\n"))); } @@ -525,21 +530,21 @@ LoggingWorker::start () { ACE_Time_Value delay; if (this->ns_->orb_->orb_core()->reactor()-> - schedule_timer (logging_strategy, 0, delay, + schedule_timer (logging_strategy, 0, delay, this->ns_->logging_interval_) == -1) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t)failed to schedule ") ACE_TEXT("logging switch timer\n"))); } } } - + } } -int +int LoggingWorker::svc (void) { ACE_DEBUG ((LM_DEBUG, @@ -586,13 +591,13 @@ Worker::svc (void) int priority; if (ACE_Thread::getprio (current, priority) == -1) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Failed to get ") ACE_TEXT ("Worker thread priority\n"))); return -1; } - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated Worker Thread to run ") ACE_TEXT ("the ORB @ priority:%d\n", priority)); #endif diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index 2feb23b3204..a3c082120ae 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -40,7 +40,7 @@ class LoggingWorker : public ACE_Task_Base void start (); void end (); private: - + ACE_Reactor logging_reactor_; TAO_Notify_Service_Driver* ns_; bool started_; @@ -133,8 +133,8 @@ protected: /// The Factory name. ACE_CString notify_factory_name_; - /// The Factory name. - ACE_CString notify_channel_name_; + /// The event channel names. + ACE_Unbounded_Set notify_channel_name_; /// true: create an event channel and registers it with the Naming Service /// with the name diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index f3a59934841..5fa36386788 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -4108,7 +4108,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, break; } AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec; - AVStreams::protocolSpec *temp_protocols; + AVStreams::protocolSpec *temp_protocols = 0; CORBA::Any_var AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"); AvailableProtocols_ptr.in () >>= temp_protocols; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index 96a058330cc..cd72ac42037 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -95,7 +95,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request) CORBA::NamedValue_ptr nv = list->item (0); CORBA::Any_ptr ap = nv->value (); - const char *value; + const char *value = 0; *ap >>= value; if (TAO_debug_level >= 10) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 846388ea8d8..7512098d5fe 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -260,7 +260,7 @@ namespace TAO if (!(ocdr << gtc.object_group_ref_version)) return; - CORBA::ULong length = + CORBA::ULong const length = static_cast (ocdr.total_length ()); sc.context_data.length (length); CORBA::Octet *buf = sc.context_data.get_buffer (); @@ -274,8 +274,7 @@ namespace TAO } } // Add this context to the service context list. - ri->add_request_service_context (sc, - 0); + ri->add_request_service_context (sc, 0); } catch (const CORBA::Exception&) @@ -350,8 +349,7 @@ namespace TAO } // Add this context to the service context list. - ri->add_request_service_context (sc, - 0); + ri->add_request_service_context (sc, 0); } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index b01e0a770c4..da435eb281a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n")); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); Federated_Test::Control_var control = Federated_Test::Control::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 1f66f83bfb8..11e43114d84 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -127,11 +127,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) AVStreams::StreamCtrl_var stream_control = stream_control_impl._this (); - obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ping_ior)); + obj = orb->string_to_object (ping_ior); AVStreams::MMDevice_var ping_sender = AVStreams::MMDevice::_narrow (obj.in ()); - obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (pong_ior)); + obj = orb->string_to_object (pong_ior); AVStreams::MMDevice_var pong_sender = AVStreams::MMDevice::_narrow (obj.in ()); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index bdf3372d8d6..cd38accf129 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -152,13 +152,13 @@ Manager::make_merged_iors (void) { // First server object_primary = - this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (first_ior)); + this->orb_->string_to_object (first_ior); if (merged_test) { //Second server object_secondary = - this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (second_ior)); + this->orb_->string_to_object (second_ior); // Get an object reference for the ORBs IORManipultion object! CORBA::Object_var IORM = diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 01d25056a80..23a46495737 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -147,7 +147,7 @@ Manager::make_merged_iors (void) if (CORBA::is_nil (iorm.in())) return -1; - CORBA::Object_var first = orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (first_ior)); + CORBA::Object_var first = orb_->string_to_object (first_ior); if (CORBA::is_nil (first.in())) return -1; @@ -172,13 +172,13 @@ Manager::make_merged_iors (void) return -1; } - first = orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (first_ior)); + first = orb_->string_to_object (first_ior); if (CORBA::is_nil (first.in())) { return -1; } - CORBA::Object_var second = orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (second_ior)); + CORBA::Object_var second = orb_->string_to_object (second_ior); if (CORBA::is_nil (second.in())) { diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp index f432d67b0b1..b03930bcffe 100644 --- a/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp @@ -15,13 +15,11 @@ DllORB::DllORB () { } - DllORB::~DllORB () { delete mp_barrier_; } - int DllORB::init (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp index 651abc13e44..f86033651b1 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp @@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 7083f81daae..47fe59c26fc 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -119,11 +119,11 @@ Manager::make_merged_iors (void) { // First server this->object_primary_ = - this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (first_ior)); + this->orb_->string_to_object (first_ior); //Second server this->object_secondary_ = - this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (second_ior)); + this->orb_->string_to_object (second_ior); // Get an object reference for the ORBs IORManipultion object! CORBA::Object_var IORM = diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp index 0b6139b10d7..504f91cd53d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp @@ -49,7 +49,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - CORBA::Object_var tmp = orb->string_to_object(ACE_TEXT_ALWAYS_CHAR (ior)); + CORBA::Object_var tmp = orb->string_to_object (ior); bug_689_regression_var servant = bug_689_regression::_narrow(tmp.in ()); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp index a1a1980214a..851a4413e21 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp @@ -68,7 +68,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // get IFR CORBA::Object_var objref = - the_orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ifr_ior_file)); + the_orb->string_to_object (ifr_ior_file); if (objref.in () == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp index f78c99d7aaa..f53a114a07d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp @@ -68,7 +68,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DEBUG (( LM_DEBUG, "Get IFR\n" )); CORBA::Object_var objref = - the_orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ifr_ior_file)); + the_orb->string_to_object (ifr_ior_file); if (objref.in () == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index c858dfb4703..2b96ae1eb14 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -120,7 +120,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp index 6324c4ae295..cc1f4b56d33 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp @@ -106,7 +106,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp index c5c000dc712..5c468af3148 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp @@ -109,7 +109,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc new file mode 100644 index 00000000000..2c4b8f96405 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc @@ -0,0 +1,10 @@ +// -*- MPC -*- +// $Id$ + +project(*Ntf Cons): notifytest { + exename = Consumer + + Source_Files { + Consumer.cpp + } +} diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp new file mode 100644 index 00000000000..9df63f6ddb7 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp @@ -0,0 +1,49 @@ +// $Id$ + +// ****************************************************************** +// Include Section +// ****************************************************************** + +#include "Notify_Test_Client.h" + +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" + +int +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + int status = 0; + try + { + Notify_Test_Client client; + ACE_Argv_Type_Converter argcon (argc, argv); + status = client.init (argcon.get_argc (), argcon.get_TCHAR_argv ()); + + if (status == 0) + { + CosNaming::NamingContext_ptr naming = client.naming_context (); + CORBA::ORB_ptr orb = client.orb (); + if (CORBA::is_nil (naming)) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Can't find naming service\n"), + 1); + } + + CosNaming::Name name (1); + name.length (1); + name[0].id = CORBA::string_dup ("Channel1"); + CORBA::Object_var obj1 = naming->resolve (name); + + name[0].id = CORBA::string_dup ("Channel2"); + CORBA::Object_var obj2 = naming->resolve (name); + } + } + catch (const CORBA::Exception& e) + { + e._tao_print_exception ("Error: "); + status = 1; + } + + return status; +} diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl new file mode 100755 index 00000000000..ea85277c793 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl @@ -0,0 +1,63 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::Run_Test; + +PerlACE::add_lib_path ('../lib'); + +use strict; + +my $status = 0; +my $port = PerlACE::random_port(); +my $namingior = PerlACE::LocalFile("naming.ior"); +my $notifyior = PerlACE::LocalFile("notify.ior"); + +my $NS = new PerlACE::Process("../../../Naming_Service/Naming_Service", + "-ORBEndpoint iiop://localhost:$port " . + "-o $namingior"); +my $TS = new PerlACE::Process("../../../Notify_Service/Notify_Service", + "-ORBInitRef NameService=iioploc://" . + "localhost:$port/NameService " . + "-IORoutput $notifyior " . + "-Channel -ChannelName Channel1 -ChannelName Channel2"); +my $STC1 = new PerlACE::Process("Consumer", + "-ORBInitRef NameService=iioploc://" . + "localhost:$port/NameService"); + +unlink($notifyior, $namingior); + +$NS->Spawn(); +if (PerlACE::waitforfile_timed($namingior, $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: waiting for the naming service to start\n"; + $NS->Kill(); + exit(1); +} + +$TS->Spawn(); +if (PerlACE::waitforfile_timed($notifyior, $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: waiting for the notify service to start\n"; + $TS->Kill(); + $NS->Kill(); + exit(1); +} + +$STC1->Spawn(); + +sleep(2); + +my $client = $STC1->WaitKill(5); +if ($client != 0) { + $status = 1; +} + +$TS->Kill(); +$NS->Kill(); + +unlink($notifyior, $namingior); + +exit($status); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index 548b7cc248d..28740cd1d36 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -143,7 +143,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); ACE_ASSERT(! CORBA::is_nil (sig.in ())); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index 0932797a96c..e0993c96011 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -137,7 +137,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp index e92491f132f..1df0032fdbb 100644 --- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp @@ -110,7 +110,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); MonitorTestInterface_var sig = MonitorTestInterface::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index b2881392410..c01916d604d 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -273,7 +273,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) } CORBA::Object_var obj = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (monitor_ior)); + orb->string_to_object (monitor_ior); CosNotification::NotificationServiceMonitorControl_var nsm = CosNotification::NotificationServiceMonitorControl::_narrow (obj.in ()); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 51d5e79fbd4..facf5ed49d5 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -133,7 +133,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) client.create_event_channel ("MyEventChannel", 1); CORBA::Object_var object = - client.orb ()->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + client.orb ()->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 4e5ad4a400b..16015d954ac 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -136,7 +136,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index b3e7984489b..ecf6941a992 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -131,7 +131,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index 078b3512fce..b28b7d70b8c 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -145,7 +145,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index ae1eb6f7f2f..d88b6646b70 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -123,7 +123,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index 91faa38d6bb..fb95de7463a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -108,9 +108,7 @@ Notify_Test_Client::resolve_Notify_factory (void) this->naming_context_->resolve (name); this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow ( - obj.in () - ); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); } int @@ -177,24 +175,20 @@ Notify_Test_Client::root_poa (void) return this->root_poa_.in (); } - CosNaming::NamingContext_ptr Notify_Test_Client::naming_context (void) { return this->naming_context_.in (); } - CosNotifyChannelAdmin::EventChannelFactory_ptr Notify_Test_Client::notify_factory (void) { return this->notify_factory_.in (); } - CosNotifyChannelAdmin::EventChannel_ptr -Notify_Test_Client::create_event_channel (const char* cname, - int resolve) +Notify_Test_Client::create_event_channel (const char* cname, bool resolve) { CosNotifyChannelAdmin::EventChannel_var ec; CosNaming::Name name (1); @@ -221,7 +215,6 @@ Notify_Test_Client::create_event_channel (const char* cname, initial_admin, id); - naming_context_->rebind(name, ec.in()); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index f27c82a0dfd..8df3e0f673f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -70,7 +70,7 @@ public: CosNotifyChannelAdmin::EventChannel_ptr create_event_channel ( const char* name, - int resolve + bool resolve ); // Create an Event Channel. Ownership is passed to the caller. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 8d2e6657bc4..cac550ca29e 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 7d39cac8653..850a9061f4a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -163,7 +163,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + orb->string_to_object (ior); sig_var sig = sig::_narrow (object.in ()); diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index c346ecb4c22..75926732c39 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -55,7 +55,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Use the first argument to create the object reference. CORBA::Object_var object = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1])); + orb->string_to_object (argv[1]); // Check if this object reference is a valid one.. CORBA::Boolean not_exists = -- cgit v1.2.1