summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-04-09 10:16:10 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-04-09 10:16:10 +0000
commit5bc0999d0c3f55389d7a36c05ec2f9af66861741 (patch)
treebf82ddddbcbc424db383a5f050f54d31d332e0d9
parent4226a8dc457de446a795eb39836291ab43f2ed75 (diff)
downloadATCD-5bc0999d0c3f55389d7a36c05ec2f9af66861741.tar.gz
Fri Apr 9 10:17:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Servants/Connector_Servant_Impl_Base.cpp: Fixed default behaviour
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp17
2 files changed, 19 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 009af748bbc..d9add922b35 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 9 10:17:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+ Fixed default behaviour
+
Fri Apr 9 09:46:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index 4e515f01e45..107cbf3e362 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -354,16 +354,27 @@ namespace CIAO
void
Connector_Servant_Impl_Base::connect_consumer (
- const char * /* emitter_name */,
+ const char * emitter_name,
::Components::EventConsumerBase_ptr /* consumer */)
{
+ if (emitter_name == 0)
+ {
+ throw ::CORBA::BAD_PARAM ();
+ }
+
+ throw ::Components::InvalidName ();
}
::Components::EventConsumerBase_ptr
Connector_Servant_Impl_Base::disconnect_consumer (
- const char * /* source_name */)
+ const char * source_name)
{
- return ::Components::EventConsumerBase::_nil ();
+ if (source_name == 0)
+ {
+ throw ::CORBA::BAD_PARAM ();
+ }
+
+ throw ::Components::InvalidName ();
}
::Components::Cookie *