diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-07 12:38:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-07 12:38:33 +0000 |
| commit | 7c96a3955083a35cfdc5ac0d69ce19cb4b3ac095 (patch) | |
| tree | 21b18b5407ada21074987a974f4e7401c06c76e8 /CIAO/ciao | |
| parent | 5e46ca87e4707207b7524bd32e41824139e5e0ca (diff) | |
| download | ATCD-7c96a3955083a35cfdc5ac0d69ce19cb4b3ac095.tar.gz | |
Tue Aug 7 12:37:45 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Deployment/Handlers/Component_Handler.cpp:
Fixed incorrect debug statements
* ciao/Deployment/Interceptors/Name_Utilities.h:
Layout changes
Diffstat (limited to 'CIAO/ciao')
| -rw-r--r-- | CIAO/ciao/Deployment/Handlers/Component_Handler.cpp | 13 | ||||
| -rw-r--r-- | CIAO/ciao/Deployment/Interceptors/Name_Utilities.h | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp index ee397e3733b..413ce5c9944 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp @@ -11,9 +11,6 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" - - - namespace CIAO { @@ -352,7 +349,7 @@ namespace CIAO if (CORBA::is_nil (cont)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " + "Component_Handler_i::activate_instance - " "Object reference for container of instance <%C> is nil!\n", plan.instance[instanceRef].name.in ())); throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), @@ -362,7 +359,7 @@ namespace CIAO if (CORBA::is_nil (comp)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " + "Component_Handler_i::activate_instance - " "Object reference for instance <%C> is nil!\n", plan.instance[instanceRef].name.in ())); throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), @@ -415,7 +412,7 @@ namespace CIAO if (CORBA::is_nil (cont)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " + "Component_Handler_i::passivate_instance - " "Object reference for container of instance <%C> is nil!\n", plan.instance[instanceRef].name.in ())); throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), @@ -425,7 +422,7 @@ namespace CIAO if (CORBA::is_nil (comp)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " + "Component_Handler_i::passivate_instance - " "Object reference for instance <%C> is nil!\n", plan.instance[instanceRef].name.in ())); throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), @@ -640,13 +637,11 @@ namespace CIAO "Unknown C++ exception"); } - } void Component_Handler_i::configure (const ::Deployment::Properties & ) { - } } diff --git a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h index 467cced4ae7..1db2a667a81 100644 --- a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h +++ b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h @@ -1,7 +1,7 @@ /** * @file Name_Utilities.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * // $Id$ + * $Id$ * A set of utility methods to manages references. * */ |