diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-15 12:51:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-15 12:51:36 +0000 |
| commit | 38c871766ce0d9cb27dab1aa865c410708fb0e35 (patch) | |
| tree | 2ae68acfc447a379a9f8972607eece437f29b3be | |
| parent | d06953733bf8bb9553ea610ce46cdebecfc93891 (diff) | |
| download | ATCD-38c871766ce0d9cb27dab1aa865c410708fb0e35.tar.gz | |
Thu Feb 14 12:51:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/ciao/Context_Impl_Base.cpp | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 8175962b216..5fd0597073a 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 14 12:51:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Context_Impl_Base.cpp: + Just let resolve_service_reference throw not implemented, + need some more work + Thu Feb 14 12:22:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Container_Base.cpp: diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp index 6c12db12ab5..77089fb5048 100644 --- a/CIAO/ciao/Context_Impl_Base.cpp +++ b/CIAO/ciao/Context_Impl_Base.cpp @@ -2,8 +2,6 @@ #include "Context_Impl_Base.h" #include "Container_Base.h" -#include "Session_Container.h" -#include "tao/ORB.h" namespace CIAO { @@ -62,20 +60,9 @@ namespace CIAO } CORBA::Object_ptr - Context_Impl_Base::resolve_service_reference(const char *service_id) + Context_Impl_Base::resolve_service_reference(const char *) { - CORBA::Object_ptr obj; - try - { - obj = this->container_->the_ORB ()->resolve_initial_references (service_id); - } - catch (const ::CORBA::ORB::InvalidName&) - { - throw ::Components::CCMException ( - ::Components::OBJECT_NOT_FOUND); - } - - return obj; + throw CORBA::NO_IMPLEMENT (); } // CIAO-specific. |