*** empty log message ***

8 files changed, 100 insertions, 26 deletions

diff --git a/TAO/tao/Interceptor.cpp b/TAO/tao/Interceptor.cpp
new file mode 100644
index 00000000000..c69d51016f9
--- /dev/null
+++ b/TAO/tao/Interceptor.cpp
@@ -0,0 +1,86 @@
+// $Id$
+
+// This file defines some default no-op behavior for interceptors.
+
+#include "tao/corbafwd.h"
+#include "tao/InterceptorS.h"
+
+//  char * POA_PortableInterceptor::
+//  Interceptor::name (CORBA::Environment &)
+//  {
+//    return CORBA::string_dup ("TAO default");
+//  }
+
+void POA_PortableInterceptor::
+ServerRequestInterceptor::preinvoke (CORBA::ULong,
+                                     CORBA::Boolean,
+                                     CORBA::Object_ptr,
+                                     const char *,
+                                     IOP::ServiceContextList &,
+                                     PortableInterceptor::Cookies &,
+                                     CORBA::Environment &)
+{
+  // No-op.
+}
+
+void POA_PortableInterceptor::
+ServerRequestInterceptor::postinvoke (CORBA::ULong,
+                                      CORBA::Boolean,
+                                      CORBA::Object_ptr,
+                                      const char *,
+                                      IOP::ServiceContextList&,
+                                      PortableInterceptor::Cookies&,
+                                      CORBA::Environment &)
+{
+  // No-op.
+}
+
+void POA_PortableInterceptor::
+ServerRequestInterceptor::exception_occurred (CORBA::ULong,
+                                              CORBA::Boolean,
+                                              CORBA::Object_ptr,
+                                              const char *,
+                                              //IOP::ServiceContextList &,
+                                              //CORBA::Exception_ptr &,
+                                              PortableInterceptor::Cookies &,
+                                              CORBA::Environment &)
+{
+  // No-op.
+}
+
+void POA_PortableInterceptor::
+ClientRequestInterceptor::preinvoke (CORBA::ULong,
+                                     CORBA::Boolean,
+                                     CORBA::Object_ptr,
+                                     const char *,
+                                     IOP::ServiceContextList &,
+                                     PortableInterceptor::Cookies &,
+                                     CORBA::Environment &)
+{
+  // No-op.
+}
+
+void POA_PortableInterceptor::
+ClientRequestInterceptor::postinvoke (CORBA::ULong,
+                                      CORBA::Boolean,
+                                      CORBA::Object_ptr,
+                                      const char *,
+                                      IOP::ServiceContextList&,
+                                      PortableInterceptor::Cookies&,
+                                      CORBA::Environment &)
+{
+  // No-op.
+}
+
+void POA_PortableInterceptor::
+ClientRequestInterceptor::exception_occurred (CORBA::ULong,
+                                              CORBA::Boolean,
+                                              CORBA::Object_ptr,
+                                              const char *,
+                                              //IOP::ServiceContextList &,
+                                              //CORBA::Exception_ptr &,
+                                              PortableInterceptor::Cookies &,
+                                              CORBA::Environment &)
+{
+  // No-op.
+}
diff --git a/TAO/tao/Interceptor.pidl b/TAO/tao/Interceptor.pidl
index d5d79c21e3c..7bab9307a22 100644
--- a/TAO/tao/Interceptor.pidl
+++ b/TAO/tao/Interceptor.pidl
@@ -16,6 +16,8 @@
 #include <IOP.pidl>
 
 #pragma prefix "TAO"
+// The prefix should be changed to "omg.org" once the spec. gets
+// finallized.
 
 module PortableInterceptor
 {
@@ -69,8 +71,6 @@ module PortableInterceptor
                                in boolean response_expected,
                                in CORBA::Object objref,
                                in string operation_name,
-                               inout IOP::ServiceContextList sc,
-                               inout CORBA::Exception exc,
                                inout Cookies ck);
       // Exception interception point.
     };
@@ -109,8 +109,6 @@ module PortableInterceptor
                                in boolean response_expected,
                                in CORBA::Object objref,
                                in string operation_name,
-                               inout IOP::ServiceContextList sc,
-                               inout CORBA::Exception exc,
                                inout Cookies ck);
       // Exception occurred.
     };
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
index e339d283e7f..a3cea87c0a8 100644
--- a/TAO/tao/InterceptorC.cpp
+++ b/TAO/tao/InterceptorC.cpp
@@ -8,8 +8,8 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "tao/InterceptorC.h"
+
 #include "tao/InterceptorS.h"
-#include "tao/Any.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/InterceptorC.i"
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
index c5e015604e6..a267e5bcf0a 100644
--- a/TAO/tao/InterceptorC.h
+++ b/TAO/tao/InterceptorC.h
@@ -14,7 +14,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IOPC.h"
+#include "IOPC.h"
+#include "Any.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -525,8 +526,6 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
@@ -672,8 +671,6 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
diff --git a/TAO/tao/InterceptorS.cpp b/TAO/tao/InterceptorS.cpp
index 784d85a22eb..ef10cab4daa 100644
--- a/TAO/tao/InterceptorS.cpp
+++ b/TAO/tao/InterceptorS.cpp
@@ -332,8 +332,6 @@ void POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInterceptor::e
     CORBA::Boolean response_expected,
     CORBA::Object_ptr objref,
     const char * operation_name,
-    IOP::ServiceContextList & sc,
-    CORBA::Exception_ptr & exc,
     PortableInterceptor::Cookies & ck,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -343,8 +341,6 @@ void POA_PortableInterceptor::_tao_direct_collocated_ServerRequestInterceptor::e
       response_expected,
       objref,
       operation_name,
-      sc,
-      exc,
       ck,
       ACE_TRY_ENV
     );
@@ -488,8 +484,6 @@ void POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInterceptor::e
     CORBA::Boolean response_expected,
     CORBA::Object_ptr objref,
     const char * operation_name,
-    IOP::ServiceContextList & sc,
-    CORBA::Exception_ptr & exc,
     PortableInterceptor::Cookies & ck,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -499,8 +493,6 @@ void POA_PortableInterceptor::_tao_direct_collocated_ClientRequestInterceptor::e
       response_expected,
       objref,
       operation_name,
-      sc,
-      exc,
       ck,
       ACE_TRY_ENV
     );
diff --git a/TAO/tao/InterceptorS.h b/TAO/tao/InterceptorS.h
index fa3b4875339..c2615818501 100644
--- a/TAO/tao/InterceptorS.h
+++ b/TAO/tao/InterceptorS.h
@@ -222,8 +222,6 @@ TAO_NAMESPACE  POA_PortableInterceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         PortableInterceptor::Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
@@ -282,8 +280,6 @@ TAO_NAMESPACE  POA_PortableInterceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         PortableInterceptor::Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
@@ -353,8 +349,6 @@ TAO_NAMESPACE  POA_PortableInterceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         PortableInterceptor::Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
@@ -413,8 +407,6 @@ TAO_NAMESPACE  POA_PortableInterceptor
         CORBA::Boolean response_expected,
         CORBA::Object_ptr objref,
         const char * operation_name,
-        IOP::ServiceContextList & sc,
-        CORBA::Exception_ptr & exc,
         PortableInterceptor::Cookies & ck,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 158e46d1ea7..15acda94138 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -93,6 +93,9 @@ public:
   // Accessor to the request ServiceContextList.  Only valid when
   // sending a request message.
 
+  CORBA::ULong request_id (void);
+  // Return the request id of this invocation.
+
   TAO_OutputCDR &out_stream (void);
   // Return the underlying output stream.
 
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index c65c7a90a14..2956cb7944d 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -17,6 +17,12 @@ TAO_GIOP_Invocation::request_service_info (void)
   return this->request_service_info_;
 }
 
+ACE_INLINE CORBA::ULong
+TAO_GIOP_Invocation::request_id (void)
+{
+  return this->request_id_;
+}
+
 ACE_INLINE TAO_OutputCDR &
 TAO_GIOP_Invocation::out_stream (void)
 {