Fri Apr 9 08:48:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/Servants/Connector_Servant_Impl_Base.cpp:
          Throw exceptions by default

2 files changed, 18 insertions, 3 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2927671becd..34b4d66c957 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  9 08:48:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+          Throw exceptions by default
+
 Fri Apr  9 08:23:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ccm/CCM_Context.idl
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index ef52c7f3143..686d76d420d 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -371,7 +371,12 @@ namespace CIAO
     const char * /* name */,
     ::CORBA::Object_ptr /* connection */)
   {
-    return 0;
+    if (name == 0)
+      {
+        throw ::CORBA::BAD_PARAM ();
+      }
+
+    throw ::Components::InvalidName ();
   }
 
   ::CORBA::Object_ptr
@@ -379,7 +384,12 @@ namespace CIAO
     const char * /* name */,
     ::Components::Cookie * /* ck */)
   {
-    return ::CORBA::Object::_nil ();
+    if (name == 0)
+      {
+        throw ::CORBA::BAD_PARAM ();
+      }
+
+    throw ::Components::InvalidName ();
   }
 
   /// CIAO-specific public methods.
@@ -611,7 +621,7 @@ namespace CIAO
                      "Connector_Servant_Impl_Base::add_receptacle - Successfully added new receptacle named (%C)\n",
                      receptacle_name));
       }
-#endif      
+#endif
   }
 }