diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-12 11:18:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-12 11:18:30 +0000 |
| commit | 6ef1d4954e01de06ff00651fc0c4460702a702f0 (patch) | |
| tree | 650f23a87d5d7d72bd9c7d955e1d3e4f4e403b98 | |
| parent | ac1f3f63564626ff4b69d187f4c8bfbeba4ed0e2 (diff) | |
| download | ATCD-6ef1d4954e01de06ff00651fc0c4460702a702f0.tar.gz | |
Fri Oct 12 11:18:03 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ccm/CCM_Transaction.idl:
Removed old comment
* ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
Fixed some logging statements
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/ccm/CCM_Transaction.idl | 1 | ||||
| -rw-r--r-- | CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 978829eea80..af4f8bfa930 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Oct 12 11:18:03 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ccm/CCM_Transaction.idl: + Removed old comment + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + Fixed some logging statements + Fri Oct 12 10:53:23 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/CIAO/ccm/CCM_Transaction.idl b/CIAO/ccm/CCM_Transaction.idl index 7e85f9614e7..00170ff16a9 100644 --- a/CIAO/ccm/CCM_Transaction.idl +++ b/CIAO/ccm/CCM_Transaction.idl @@ -10,7 +10,6 @@ module Components { typeprefix Components "omg.org"; - // @@ Components::Transaction is still there. module Transaction { diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp index 0946d292ebb..a5f128de2d4 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp @@ -19,9 +19,9 @@ namespace CIAO if (CORBA::is_nil (this->orb_)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::configure -" + "CIAO_StoreReferences_i::CIAO_StoreReferences_i -" "Unable to locate ORB.\n")); - throw ::Deployment::StartError ("CIAO Container Handler", + throw ::Deployment::StartError ("CIAO_StoreReferences_i", "Unable to locate ORB"); } } @@ -135,7 +135,7 @@ namespace CIAO CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO_ReferenceLookup_i::CIAO_ReferenceLookup_i -" "Unable to locate ORB.\n")); - throw ::Deployment::StartError ("CIAO Container Handler", + throw ::Deployment::StartError ("CIAO_ReferenceLookup_i", "Unable to locate ORB"); } } |