*** empty log message ***

8 files changed, 244 insertions, 337 deletions

diff --git a/TAO/tao/Interceptor.pidl b/TAO/tao/Interceptor.pidl
index 012219aa1c5..8e8e6478706 100644
--- a/TAO/tao/Interceptor.pidl
+++ b/TAO/tao/Interceptor.pidl
@@ -43,10 +43,6 @@ module PortableInterceptor
       // This method will eventually changed to support
       // AMI.
 
-      IOP::ServiceContextList get_service_contexts ();
-      boolean set_service_contexts (in IOP::ServiceContextList sc);
-      // Accessor/mutator for the service context list.
-
       CORBA::Object get_object ();
       // Get the object reference the targeting object.
 
@@ -70,14 +66,17 @@ module PortableInterceptor
       // Server side request interceptor definition.
 
       void preinvoke (inout RequestInfo ri,
+                      inout IOP::ServiceContextList sc,
                       inout Cookies ck);
       // Interception pointer before invoking the servant method.
 
       void postinvoke (inout RequestInfo ri,
+                       inout IOP::ServiceContextList sc,
                        inout Cookies ck);
       // Interception pointer after invoking the servant method.
 
       void exception_occurred (inout RequestInfo ri,
+                               inout IOP::ServiceContextList sc,
                                inout Cookies ck);
       // Exception interception point.
     };
@@ -87,14 +86,17 @@ module PortableInterceptor
       // Client side interceptor.
 
       void preinvoke (inout RequestInfo ri,
+                      inout IOP::ServiceContextList sc,
                       inout Cookies ck);
       // Before remote invocation.
 
       void postinvoke (inout RequestInfo ri,
+                       inout IOP::ServiceContextList sc,
                        inout Cookies ck);
       // After returned from remote invocation.
 
       void exception_occurred (inout RequestInfo ri,
+                               inout IOP::ServiceContextList sc,
                                inout Cookies ck);
       // Exception occurred.
     };
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
index d7c959033f4..930071ba71f 100644
--- a/TAO/tao/InterceptorC.cpp
+++ b/TAO/tao/InterceptorC.cpp
@@ -7,12 +7,12 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "InterceptorC.h"
-#include "InterceptorS.h"
+#include "tao/InterceptorC.h"
+#include "tao/InterceptorS.h"
 #include "tao/Any.h"
 
 #if !defined (__ACE_INLINE__)
-#include "InterceptorC.i"
+#include "tao/InterceptorC.i"
 #endif /* !defined INLINE */
 
 PortableInterceptor::Cookie_ptr PortableInterceptor::Cookie::_narrow (
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
index f5c7bc6f0ee..c14fd041727 100644
--- a/TAO/tao/InterceptorC.h
+++ b/TAO/tao/InterceptorC.h
@@ -10,12 +10,12 @@
 #ifndef _TAO_IDL_INTERCEPTORC_H_
 #define _TAO_IDL_INTERCEPTORC_H_
 
-#include "tao/IOPC.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/IOPC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -122,11 +122,9 @@ class TAO_Export Cookie : public virtual ACE_CORBA_1 (Object)
       }
 
     virtual char * myname (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
@@ -383,60 +381,46 @@ class TAO_Export RequestInfo : public virtual ACE_CORBA_1 (Object)
       }
 
     virtual CORBA::ULong get_request_id (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean response_expected (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual IOP::ServiceContextList * get_service_contexts (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean set_service_contexts (
-        const IOP::ServiceContextList & sc
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        const IOP::ServiceContextList & sc,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Object_ptr get_object (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual char * get_operation (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::NVList_ptr get_arguments (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean set_arguments (
-        CORBA::NVList_ptr args
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::NVList_ptr args,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
@@ -552,11 +536,9 @@ class TAO_Export Interceptor : public virtual ACE_CORBA_1 (Object)
       }
 
     virtual char * name (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
@@ -673,27 +655,24 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
 
     virtual void preinvoke (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void postinvoke (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void exception_occurred (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
@@ -810,27 +789,24 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
 
     virtual void preinvoke (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void postinvoke (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void exception_occurred (
         RequestInfo_ptr & ri,
-        Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
@@ -880,7 +856,7 @@ void TAO_Export operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInt
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor *&);
 
 #if defined (__ACE_INLINE__)
-#include "InterceptorC.i"
+#include "tao/InterceptorC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/InterceptorS.cpp b/TAO/tao/InterceptorS.cpp
index c2ab7934f38..e6634c3b9af 100644
--- a/TAO/tao/InterceptorS.cpp
+++ b/TAO/tao/InterceptorS.cpp
@@ -7,7 +7,7 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "InterceptorS.h"
+#include "tao/InterceptorS.h"
 
 // skeleton constructor
 POA_PortableInterceptor::Cookie::Cookie (void)
@@ -92,14 +92,11 @@ CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_Cookie::_non_exis
 
 
 char * POA_PortableInterceptor::_tao_direct_collocated_Cookie::myname  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->myname (
-
+      ACE_TRY_ENV
     );
 
 }
@@ -189,105 +186,85 @@ CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::_non
 
 
 CORBA::ULong POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::get_request_id  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->get_request_id (
-
+      ACE_TRY_ENV
     );
 
 }
 
 CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::response_expected  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->response_expected (
-
+      ACE_TRY_ENV
     );
 
 }
 
 IOP::ServiceContextList * POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::get_service_contexts  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->get_service_contexts (
-
+      ACE_TRY_ENV
     );
 
 }
 
 CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::set_service_contexts  (
-    const IOP::ServiceContextList & sc
+    const IOP::ServiceContextList & sc,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->set_service_contexts (
-      sc
+      sc,
+      ACE_TRY_ENV
     );
 
 }
 
 CORBA::Object_ptr POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::get_object  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->get_object (
-
+      ACE_TRY_ENV
     );
 
 }
 
 char * POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::get_operation  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->get_operation (
-
+      ACE_TRY_ENV
     );
 
 }
 
 CORBA::NVList_ptr POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::get_arguments  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->get_arguments (
-
+      ACE_TRY_ENV
     );
 
 }
 
 CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_RequestInfo::set_arguments  (
-    CORBA::NVList_ptr args
+    CORBA::NVList_ptr args,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->set_arguments (
-      args
+      args,
+      ACE_TRY_ENV
     );
 
 }
@@ -377,14 +354,11 @@ CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_Interceptor::_non
 
 
 char * POA_PortableInterceptor::_tao_direct_collocated_Interceptor::name  (
-
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->servant_->name (
-
+      ACE_TRY_ENV
     );
 
 }
@@ -479,45 +453,42 @@ CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInte
 
 void POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInterceptor::preinvoke  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->preinvoke (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
 
 void POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInterceptor::postinvoke  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->postinvoke (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
 
 void POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInterceptor::exception_occurred  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->exception_occurred (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
@@ -612,45 +583,42 @@ CORBA::Boolean POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInte
 
 void POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInterceptor::preinvoke  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->preinvoke (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
 
 void POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInterceptor::postinvoke  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->postinvoke (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
 
 void POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInterceptor::exception_occurred  (
     PortableInterceptor::RequestInfo_ptr & ri,
-    PortableInterceptor::Cookies & ck
+    PortableInterceptor::Cookies & ck,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->servant_->exception_occurred (
       ri,
-      ck
+      ck,
+      ACE_TRY_ENV
     );
 
 }
diff --git a/TAO/tao/InterceptorS.h b/TAO/tao/InterceptorS.h
index e290271ffe9..f120765487d 100644
--- a/TAO/tao/InterceptorS.h
+++ b/TAO/tao/InterceptorS.h
@@ -10,8 +10,7 @@
 #ifndef _TAO_IDL_INTERCEPTORS_H_
 #define _TAO_IDL_INTERCEPTORS_H_
 
-#include "InterceptorC.h"
-
+#include "tao/InterceptorC.h"
 #include "tao/Servant_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -53,11 +52,9 @@ TAO_NAMESPACE  POA_PortableInterceptor
     virtual const char* _interface_repository_id (void) const;
 
     virtual char * myname (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
 
   };
@@ -85,11 +82,9 @@ TAO_NAMESPACE  POA_PortableInterceptor
       );
 
         virtual char * myname (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
 
   private:
@@ -129,60 +124,46 @@ TAO_NAMESPACE  POA_PortableInterceptor
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::ULong get_request_id (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean response_expected (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual IOP::ServiceContextList * get_service_contexts (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean set_service_contexts (
-        const IOP::ServiceContextList & sc
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        const IOP::ServiceContextList & sc,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Object_ptr get_object (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual char * get_operation (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::NVList_ptr get_arguments (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual CORBA::Boolean set_arguments (
-        CORBA::NVList_ptr args
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::NVList_ptr args,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
 
   };
@@ -210,60 +191,46 @@ TAO_NAMESPACE  POA_PortableInterceptor
       );
 
         virtual CORBA::ULong get_request_id (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual CORBA::Boolean response_expected (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual IOP::ServiceContextList * get_service_contexts (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual CORBA::Boolean set_service_contexts (
-        const IOP::ServiceContextList & sc
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        const IOP::ServiceContextList & sc,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual CORBA::Object_ptr get_object (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual char * get_operation (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual CORBA::NVList_ptr get_arguments (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual CORBA::Boolean set_arguments (
-        CORBA::NVList_ptr args
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::NVList_ptr args,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
 
   private:
@@ -303,11 +270,9 @@ TAO_NAMESPACE  POA_PortableInterceptor
     virtual const char* _interface_repository_id (void) const;
 
     virtual char * name (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
 
   };
@@ -335,11 +300,9 @@ TAO_NAMESPACE  POA_PortableInterceptor
       );
 
         virtual char * name (
-
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
 
   private:
@@ -380,27 +343,24 @@ TAO_NAMESPACE  POA_PortableInterceptor
 
     virtual void preinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void postinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void exception_occurred (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
 
   };
@@ -430,27 +390,24 @@ TAO_NAMESPACE  POA_PortableInterceptor
 
         virtual void preinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual void postinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual void exception_occurred (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
 
   private:
@@ -491,27 +448,24 @@ TAO_NAMESPACE  POA_PortableInterceptor
 
     virtual void preinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void postinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
     virtual void exception_occurred (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      ) = 0;
 
 
   };
@@ -541,27 +495,24 @@ TAO_NAMESPACE  POA_PortableInterceptor
 
         virtual void preinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual void postinvoke (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
     virtual void exception_occurred (
         PortableInterceptor::RequestInfo_ptr & ri,
-        PortableInterceptor::Cookies & ck
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        PortableInterceptor::Cookies & ck,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
 
   private:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 5d3b4c02ec4..e4afb26d1d8 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -156,6 +156,8 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
 # ifdef TAO_HAS_VALUETYPE
     valuetype_factory_map_ (0),
 # endif /* TAO_HAS_VALUETYPE */
+    client_interceptor_ (),
+    server_interceptor_ (),
     use_omg_ior_format_ (1)
 {
 }
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 657b7b4f693..b9e758ed776 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -388,16 +388,22 @@ public:
   PortableInterceptor::ClientRequestInterceptor_ptr _register_client_interceptor
   (PortableInterceptor::ClientRequestInterceptor_ptr ci,
    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // Registerring the client-side request interceptor.  Unregister it with
+  // a null interceptor.
 
   PortableInterceptor::ServerRequestInterceptor_ptr _register_server_interceptor
   (PortableInterceptor::ServerRequestInterceptor_ptr ci,
    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // Registerring the server-side request interceptor.  Unregister it with
+  // a null interceptor.
 
   PortableInterceptor::ClientRequestInterceptor_ptr _get_client_interceptor
     (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // accessor to the client-side interceptor.  You get a duplicate.
 
   PortableInterceptor::ServerRequestInterceptor_ptr _get_server_interceptor
     (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // accessor to the server-side interceptor.  You get a duplicate.
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index ff56440fcd1..a50f43f7c36 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -320,7 +320,8 @@ CORBA_ORB::_register_client_interceptor
   (PortableInterceptor::ClientRequestInterceptor_ptr ci,
    CORBA_Environment &ACE_TRY_ENV)
 {
-  if (ci->_is_a ("IDL:TAO/PortableInterceptor/ClientRequestInterceptor:1.0"))
+  if (ci == 0 ||
+      ci->_is_a ("IDL:TAO/PortableInterceptor/ClientRequestInterceptor:1.0"))
       {
         PortableInterceptor::ClientRequestInterceptor_var oci =
           PortableInterceptor::ClientRequestInterceptor::_duplicate (this->client_interceptor_);
@@ -333,14 +334,15 @@ CORBA_ORB::_register_client_interceptor
 
 ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr
 CORBA_ORB::_register_server_interceptor
-  (PortableInterceptor::ServerRequestInterceptor_ptr ci,
+  (PortableInterceptor::ServerRequestInterceptor_ptr si,
    CORBA_Environment &ACE_TRY_ENV)
 {
-  if (ci->_is_a ("IDL:TAO/PortableInterceptor/ServerRequestInterceptor:1.0"))
+  if (si == 0 ||
+      si->_is_a ("IDL:TAO/PortableInterceptor/ServerRequestInterceptor:1.0"))
       {
         PortableInterceptor::ServerRequestInterceptor_var oci =
           PortableInterceptor::ServerRequestInterceptor::_duplicate (this->server_interceptor_);
-        this->server_interceptor_ = ci;
+        this->server_interceptor_ = si;
         return oci._retn ();
       }
   else