diff options
| -rw-r--r-- | modules/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | modules/CIAO/connectors/AMI_CCM/AMI4CCM-explanation.odt | bin | 0 -> 26430 bytes | |||
| -rw-r--r-- | modules/CIAO/connectors/AMI_CCM/AMI4CCM-spec.odt | bin | 0 -> 25192 bytes | |||
| -rw-r--r-- | modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 858a012a192..54aad336afc 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Aug 31 11:09:40 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * connectors/AMI_CCM/AMI4CCM-explanation.odt: + * connectors/AMI_CCM/AMI4CCM-spec.odt: + Added. + + * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: + Resolved bug regarding the MyInterface interface. + Mon Aug 31 10:39:25 UTC 2009 Marcel Smit <msmit@remedy.nl> * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: diff --git a/modules/CIAO/connectors/AMI_CCM/AMI4CCM-explanation.odt b/modules/CIAO/connectors/AMI_CCM/AMI4CCM-explanation.odt Binary files differnew file mode 100644 index 00000000000..cb8e8f88212 --- /dev/null +++ b/modules/CIAO/connectors/AMI_CCM/AMI4CCM-explanation.odt diff --git a/modules/CIAO/connectors/AMI_CCM/AMI4CCM-spec.odt b/modules/CIAO/connectors/AMI_CCM/AMI4CCM-spec.odt Binary files differnew file mode 100644 index 00000000000..b956660fa05 --- /dev/null +++ b/modules/CIAO/connectors/AMI_CCM/AMI4CCM-spec.odt diff --git a/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp index 5b9662ebd5a..56abd39c96a 100644 --- a/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp +++ b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp @@ -239,7 +239,7 @@ namespace CIAO_Hello_AMI_Sender_Impl ::CCM_AMI::CCM_AMI_MyInterface_callback_ptr Sender_exec_i::get_the_my_interface_callback () { - if (CORBA::is_nil (global_foo_callback_)) + if (CORBA::is_nil (global_interface_callback_)) { global_interface_callback_ = new MyInterface_callback_exec_i (); } |