diff options
| -rw-r--r-- | ACE/ace/Service_Gestalt.h | 6 | ||||
| -rw-r--r-- | TAO/docs/notification/reliability.html | 20 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Security/mixed_security_test/README | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h index aae3b398124..0a4d9b158a4 100644 --- a/ACE/ace/Service_Gestalt.h +++ b/ACE/ace/Service_Gestalt.h @@ -263,9 +263,9 @@ public: #if (ACE_USES_CLASSIC_SVC_CONF == 1) /// Dynamically link the shared object file and retrieve a pointer to /// the designated shared object in this file. Also account for the - /// possiblity to have static services registered when loading the DLL, by - /// ensuring that the dynamic sevice is registered before any of its - /// subordibnate static services. Thus avoiding any finalization order + /// possibility to have static services registered when loading the DLL, by + /// ensuring that the dynamic service is registered before any of its + /// subordinate static services. Thus avoiding any finalization order /// problems. int initialize (const ACE_Service_Type_Factory *, const ACE_TCHAR *parameters); diff --git a/TAO/docs/notification/reliability.html b/TAO/docs/notification/reliability.html index 2afc6272015..49b2d9a059a 100644 --- a/TAO/docs/notification/reliability.html +++ b/TAO/docs/notification/reliability.html @@ -281,19 +281,19 @@ <P>The interfaces involved are defined in the NotifyExt.idl file (in $TAO_ROOT/orbsvcs/orbsvcs) and are shown here:</P> <pre> - /** + /** * \brief An interface which gets registered with a ReconnectionRegistry. - * - * A supplier or consumer must implement this interface in order to - * allow the Notification Service to attempt to reconnect to it after - * a failure. The supplier or consumer must register its instance of + * + * A supplier or consumer must implement this interface in order to + * allow the Notification Service to attempt to reconnect to it after + * a failure. The supplier or consumer must register its instance of * this interface with the ReconnectionRegistry. - */ + */ interface ReconnectionCallback - { - /// Perform operations to reconnect to the Notification Service + { + /// Perform operations to reconnect to the Notification Service /// after a failure. - void reconnect (in Object new_connection); + void reconnect (in Object new_connection); /// Check to see if the ReconnectionCallback is alive boolean is_alive (); @@ -335,7 +335,7 @@ </P> <P>Application code in the Consumer should be written with the knowledge that events are guaranteed to be delivered, but during recovery from a failure there - is a possiblity that an event may arrive more than once. This could + is a possibility that an event may arrive more than once. This could happen, for example if the event was in the process of being delivered at the time the failure occurred and the failure prevents the Notfication service from determining if the delivery completed successfully. To meet its diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 3069a36ed76..e86fd5b0413 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_unistd.h" const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory"; -const char* BasicLog_Test::naming_sevice_name_ = "NameService"; +const char* BasicLog_Test::naming_service_name_ = "NameService"; BasicLog_Test::BasicLog_Test(void) : argc_ (0), argv_(0), logServiceIor_ (0) @@ -513,7 +513,7 @@ void BasicLog_Test::resolve_naming_service (void) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (naming_sevice_name_); + this->orb_->resolve_initial_references (naming_service_name_); // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index c70342f25b6..fc2db452560 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -148,7 +148,7 @@ private: static const char* basic_log_factory_name_; - static const char* naming_sevice_name_; + static const char* naming_service_name_; // strings for log factory and naming service }; diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/README b/TAO/orbsvcs/tests/Security/mixed_security_test/README index 556c0f24f0b..743797121c6 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/README +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/README @@ -18,7 +18,7 @@ invocations over non-secure transport. The test verifies that a secure client can make invocations, using both the "secure" and the "non-secure" IOR from the server. Note that for the server to support the non-secure invocations it must have -SSLNoProtection -in its sevice configuration file. +in its service configuration file. The test verifies that a non-secure client can only make invocations through the "non-secure" IOR from the server. An invocation through the "secure" IOR |