diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index bfbc7cfc7e1..4274aa1006e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -41,7 +41,7 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the ") ACE_TEXT ("ORB.\n")), -1); @@ -55,7 +55,7 @@ NS_group_svc::set_naming_manager( FT_Naming::NamingManager_ptr nm) this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Naming Manager.\n")), -1); return 0; @@ -68,7 +68,7 @@ NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Name Context.\n")), -1); return 0; @@ -81,7 +81,7 @@ NS_group_svc::group_exist ( { if (group_name == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_exist args not provided\n")), false); } @@ -115,7 +115,7 @@ NS_group_svc::group_create ( if (group_name == 0 || policy == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_create args not provided\n")), -2); } @@ -124,7 +124,7 @@ NS_group_svc::group_create ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -136,7 +136,7 @@ NS_group_svc::group_create ( /// Group names must be unique if ( true == group_exist (group_name)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Group %s already exists\n"), group_name), -1); @@ -162,7 +162,7 @@ NS_group_svc::group_create ( if (CORBA::is_nil (obj.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s.\n"), group_name), -1); @@ -171,7 +171,7 @@ NS_group_svc::group_create ( } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s\n"), group_name), -1); @@ -195,7 +195,7 @@ NS_group_svc::group_bind ( if (group_name == 0 || path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_bind args not provided\n")), -2); } @@ -208,7 +208,7 @@ NS_group_svc::group_bind ( ACE_TEXT_ALWAYS_CHAR(group_name)); if (CORBA::is_nil (group_var.in())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get reference.\n")), -1); @@ -221,19 +221,19 @@ NS_group_svc::group_bind ( catch (const CosNaming::NamingContextExt::InvalidName& ex){ ex._tao_print_exception ("InvalidName Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); @@ -242,7 +242,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("SystemException Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -251,7 +251,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -263,7 +263,7 @@ int NS_group_svc::group_unbind (const ACE_TCHAR* path){ if ( path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_unbind args not provided\n")), -2); } @@ -277,19 +277,19 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::InvalidName&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); @@ -298,7 +298,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -307,7 +307,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -345,7 +345,7 @@ NS_group_svc::display_load_policy_group( const ACE_TCHAR *display_label) { if( display_label == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("display_load_policy_group args ") ACE_TEXT ("not provided\n")), -2); @@ -356,7 +356,7 @@ NS_group_svc::display_load_policy_group( FT_Naming::GroupNames_var list = this->naming_manager_->groups (strategy); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n%s Load Balancing Groups\n"), display_label)); @@ -365,13 +365,13 @@ NS_group_svc::display_load_policy_group( for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT (" %C\n"), s.in ())); } } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("No %s Load Balancing Groups Registered\n"), display_label)); } @@ -381,7 +381,7 @@ NS_group_svc::display_load_policy_group( { ex._tao_print_exception ("Exception in group_list"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get %s group list\n"), display_label), -1); @@ -403,7 +403,7 @@ NS_group_svc::group_modify ( { if (group_name == 0 || policy == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_modify args not provided\n")), -2); } @@ -412,7 +412,7 @@ NS_group_svc::group_modify ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -426,14 +426,14 @@ NS_group_svc::group_modify ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to modify group %s\n"), group_name), -1); @@ -452,7 +452,7 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_remove args not provided\n")), -2); } @@ -464,14 +464,14 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove group %s\n"), group_name), -1); @@ -494,7 +494,7 @@ NS_group_svc::member_add ( { if (group_name == 0 || location == 0 || ior == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_add args not provided\n")), -2); } @@ -514,7 +514,7 @@ NS_group_svc::member_add ( if (CORBA::is_nil (ior_var.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nInvalid member IOR provided.\n")), -1); } @@ -526,21 +526,21 @@ NS_group_svc::member_add ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::ObjectNotAdded&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); @@ -559,7 +559,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_list args not provided\n")), -2); } @@ -577,7 +577,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { const PortableGroup::Location & loc = locations[i]; if (loc.length() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), loc[0].id.in())); } @@ -586,14 +586,14 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to list members for group %s\n"), group_name), -1); @@ -614,7 +614,7 @@ NS_group_svc::member_remove ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_remove args not provided\n")), -2); } @@ -642,21 +642,21 @@ NS_group_svc::member_remove ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove member %s\n"), location), -1); @@ -678,7 +678,7 @@ NS_group_svc::member_show ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_show args not provided\n")), -2); } @@ -700,28 +700,28 @@ NS_group_svc::member_show ( CORBA::String_var ior_string = this->orb_->object_to_string (ior_var.in()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), ior_string.in())); } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member location %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to show member location %s\n"), location), -1); |