ChangeLogTag: Tue Jun 21 08:22:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 2 insertions, 51 deletions

diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index d506cc0ba95..07fb9b3f9e8 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -36,58 +36,13 @@ TAO_IORInterceptor_Adapter_Impl::add_interceptor (
 
 void
 TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC (())
 {
-  TAO::IORInterceptor_List::TYPE & i =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t len = i.size ();
-  size_t ilen = len;
-
-  ACE_TRY
-    {
-      for (size_t k = 0; k < len; ++k)
-        {
-          // Destroy the interceptors in reverse order in case the
-          // array list is only partially destroyed and another
-          // invocation occurs afterwards.
-          --ilen;
-
-          i[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Since Interceptor::destroy() can throw an exception,
-          // decrease the size of the interceptor array incrementally
-          // since some interceptors may not have been destroyed yet.
-          // Note that this size reduction is fast since no memory is
-          // actually deallocated.
-          i.size (ilen);
-        }
-    }
-  ACE_CATCHALL
-    {
-      // Exceptions should not be propagated beyond this call.
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Exception in ")
-                      ACE_TEXT ("IORInterceptor_Adapter_Impl")
-                      ACE_TEXT ("::destroy_interceptors () \n")));
-        }
-    }
-  ACE_ENDTRY;
+  this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   delete this;
 }
 
-TAO::IORInterceptor_List *
-TAO_IORInterceptor_Adapter_Impl::interceptor_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return &this->ior_interceptor_list_;
-}
-
 void
 TAO_IORInterceptor_Adapter_Impl::establish_components (
   TAO_Root_POA* poa
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 2cc2c21a670..3dcf89c485c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -46,11 +46,7 @@ public:
       PortableInterceptor::IORInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL);
 
-  virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  virtual TAO::IORInterceptor_List *interceptor_list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));