1 files changed, 8 insertions, 37 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
index fc43c2eb9a3..74cb7670bca 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
@@ -14,8 +14,8 @@
 
 #include "Naming_Context.h"
 
-TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl)
-  : impl_ (impl)
+TAO_Naming_Context::TAO_Naming_Context (void)
+  : impl_ (0)
 {
 }
 
@@ -24,6 +24,12 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
   delete impl_;
 }
 
+void
+TAO_Naming_Context::impl (TAO_Naming_Context_Impl *impl)
+{
+  impl_ = impl;
+}
+
 PortableServer::POA_ptr
 TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/)
 {
@@ -34,11 +40,6 @@ void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
                           CORBA::Object_ptr obj,
                           CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName,
-                     CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind (n, obj, ACE_TRY_ENV);
 }
@@ -47,10 +48,6 @@ void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
                             CORBA::Object_ptr obj,
                             CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind (n, obj, ACE_TRY_ENV);
 }
@@ -59,11 +56,6 @@ void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
                                   CosNaming::NamingContext_ptr nc,
                                   CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName,
-                       CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind_context (n, nc, ACE_TRY_ENV);
 }
@@ -72,10 +64,6 @@ void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
                                     CosNaming::NamingContext_ptr nc,
                                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind_context (n, nc, ACE_TRY_ENV);
 }
@@ -83,10 +71,6 @@ TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
 CORBA::Object_ptr
 TAO_Naming_Context::resolve (const CosNaming::Name &n,
                              CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->resolve (n, ACE_TRY_ENV);
 }
@@ -94,17 +78,12 @@ TAO_Naming_Context::resolve (const CosNaming::Name &n,
 void
 TAO_Naming_Context::unbind (const CosNaming::Name &n,
                             CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->unbind (n, ACE_TRY_ENV);
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return impl_->new_context (ACE_TRY_ENV);
 }
@@ -112,19 +91,12 @@ TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::bind_new_context (const CosNaming::Name &n,
                                       CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::AlreadyBound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->bind_new_context (n, ACE_TRY_ENV);
 }
 
 void
 TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotEmpty))
 {
   impl_->destroy (ACE_TRY_ENV);
 }
@@ -134,7 +106,6 @@ TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
                           CosNaming::BindingIterator_out bi,
                           CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->list (how_many, bl, bi, ACE_TRY_ENV);
 }