diff options
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/be_init.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp | 32 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 2 |
8 files changed, 38 insertions, 28 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 13cb94197b7..19f2b39d256 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Mar 8 21:27:54 UTC 2007 Steve Huston <shuston@riverace.com> + + * orbsvcs/IFR_Service/be_init.cpp (BE_save_orb_args): + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp (get_local_addr_str): + * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp (update_key): + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp: + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp (valid_id): + Thu Mar 8 17:49:52 UTC 2007 Trevor Fields <fields_t@ociweb.com> Fixed the Event Service crashing when dispatching diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp index 6a57d0af586..8ea3a129040 100644 --- a/TAO/orbsvcs/IFR_Service/be_init.cpp +++ b/TAO/orbsvcs/IFR_Service/be_init.cpp @@ -27,7 +27,7 @@ BE_save_orb_args (int &argc, char *argv[]) // No-copy constructor. ACE_CString tmp (argv[i + 1], 0, - 0); + false); // If the arg ends with either .idl or .pidl, we're done. diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index da2f6835561..e7d1f5ec94c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -477,7 +477,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_); inet_addr->addr_to_string (buf,BUFSIZ); - ACE_CString cstring (buf, 0, 0); + ACE_CString cstring (buf, 0, false); return cstring.rep (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index ff118ef9d25..4add4020c6f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -68,7 +68,7 @@ TAO_IRObject_i::update_key (void) ACE_TString path (oid_string, 0, - 0); + false); status = this->repo_->config ()->expand_path (this->repo_->root_key (), diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index a091e2c1da4..5c1cbb0ed4f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -29,7 +29,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec #else val_id <<= static_cast<ACE_UINT32> (rec.id); #endif - this->property_lookup_.bind (ACE_CString("id", 0, 0), val_id); + this->property_lookup_.bind (ACE_CString("id", 0, false), val_id); CORBA::Any val_time; @@ -38,9 +38,9 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec #else val_time <<= static_cast<ACE_UINT32> (rec.time); #endif - this->property_lookup_.bind (ACE_CString("time", 0, 0), val_time); + this->property_lookup_.bind (ACE_CString("time", 0, false), val_time); - this->property_lookup_.bind (ACE_CString("info", 0, 0), rec.info); + this->property_lookup_.bind (ACE_CString("info", 0, false), rec.info); // Bind an entry for each item in the record's attribute list. CORBA::Long len = rec.attr_list.length(); @@ -48,7 +48,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec { this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name, 0, - 0), + false), rec.attr_list[i].value); } } @@ -89,7 +89,7 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) { int return_value = -1; const char *name = ident->value (); - ACE_CString key (name, 0, 0); + ACE_CString key (name, 0, false); CORBA::Any any; @@ -371,7 +371,7 @@ TAO_Log_Constraint_Visitor::visit_component_assoc ( CORBA::Any any; ACE_CString key (assoc->identifier ()->value (), 0, - 0); + false); if (this->property_lookup_.find (key, any) != 0 || any.impl () == 0) @@ -644,7 +644,7 @@ TAO_Log_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) this->queue_.dequeue_head (top); const char *value = (const char *) top; - ACE_CString key (value, 0, 0); + ACE_CString key (value, 0, false); CORBA::Boolean result = (this->property_lookup_.find (key) == 0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index d1df620ca56..c0f9f4d3427 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -25,39 +25,39 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) { (void) this->implicit_ids_.bind (ACE_CString ("filterable_data", 0, - 0), + false), FILTERABLE_DATA); (void) this->implicit_ids_.bind (ACE_CString ("header", 0, - 0), + false), HEADER); (void) this->implicit_ids_.bind (ACE_CString ("remainder_of_body", 0, - 0), + false), REMAINDER_OF_BODY); (void) this->implicit_ids_.bind (ACE_CString ("fixed_header", 0, - 0), + false), FIXED_HEADER); (void) this->implicit_ids_.bind (ACE_CString ("variable_header", 0, - 0), + false), VARIABLE_HEADER); (void) this->implicit_ids_.bind (ACE_CString ("event_name", 0, - 0), + false), EVENT_NAME); (void) this->implicit_ids_.bind (ACE_CString ("event_type", 0, - 0), + false), EVENT_TYPE); (void) this->implicit_ids_.bind (ACE_CString ("domain_name", 0, - 0), + false), DOMAIN_NAME); (void) this->implicit_ids_.bind (ACE_CString ("type_name", 0, - 0), + false), TYPE_NAME); } @@ -72,7 +72,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str for (index = 0; index < length; ++index) { - ACE_CString name_str (s_event.filterable_data[index].name, 0, 0); + ACE_CString name_str (s_event.filterable_data[index].name, 0, false); int status = this->filterable_data_.bind ( @@ -88,7 +88,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str for (index = 0; index < length; ++index) { - ACE_CString name_str (s_event.header.variable_header[index].name, 0, 0); + ACE_CString name_str (s_event.header.variable_header[index].name, 0, false); int status = this->variable_header_.bind ( @@ -152,7 +152,7 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) { int return_value = -1; const char *name = ident->value (); - ACE_CString key (name, 0, 0); + ACE_CString key (name, 0, false); CORBA::Any any; @@ -414,7 +414,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( CORBA::Any any; ACE_CString name (assoc->identifier ()->value (), 0, - 0); + false); switch (this->implicit_id_) { @@ -629,7 +629,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( TAO_ETCL_Identifier *identifier = component->identifier (); ACE_CString component_name (identifier->value (), 0, - 0); + false); CORBA::Any *any_ptr = 0; if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0) @@ -794,11 +794,11 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) { case FILTERABLE_DATA: result = - (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0); + (this->filterable_data_.find (ACE_CString (value, 0, false)) == 0); break; case VARIABLE_HEADER: result = - (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0); + (this->variable_header_.find (ACE_CString (value, 0, false)) == 0); break; case TYPE_NAME: result = (this->type_name_.in () != 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 7010f88ca0b..935d00f88fe 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -266,7 +266,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string) // The Domain ID is terminated with a '-'. // Wrap the string in a ACE_CString - ACE_CString ace_str (string, 0, 0); + ACE_CString ace_str (string, 0, false); // Look for the group domain delimitor. ACE_CString::size_type pos = ace_str.find ('-'); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 13e0b572878..c85d97f50a5 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1513,7 +1513,7 @@ TAO_TypeCodeFactory_i::valid_id (const char *id) { ACE_CString safety (id, 0, - 0); + false); ACE_CString::size_type const pos = safety.find (':'); |