ChangeLogTag: Tue Oct 28 22:22:29 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 80 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b362a84e4ca..1968014d7f7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Tue Oct 28 22:22:29 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/FT_ORB.dsp:
+
+          Updated project file list.
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+
+          Added include of tao/Typecode.h.
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+
+          Replaced instances of TAO_INVOKE_EXCEPTION with
+          TAO::TAO_INVOKE_SYSTEM_EXCEPTION.
+
 Tue Oct 28 22:12:23 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile:
diff --git a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
index cda2f7ddfea..4459ceaaa1f 100644
--- a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
+++ b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
@@ -157,10 +157,26 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\FaultTolerance\FT_ClientORBInitializer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ClientPolicy_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ClientPolicyFactory.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\FaultTolerance\FT_ClientRequest_Interceptor.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=.\FaultTolerance\FT_ClientService_Activate.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\FT_CORBA_ORBC.cpp

 # ADD CPP /GR

 # End Source File

@@ -182,19 +198,23 @@ SOURCE=.\FaultTolerance\FT_IOGR_Property.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_ORBInitializer.cpp

+SOURCE=.\FaultTolerance\FT_ServerORBInitializer.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Policy_i.cpp

+SOURCE=.\FaultTolerance\FT_ServerPolicy_i.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_PolicyFactory.cpp

+SOURCE=.\FaultTolerance\FT_ServerPolicyFactory.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Service_Activate.cpp

+SOURCE=.\FaultTolerance\FT_ServerRequest_Interceptor.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ServerService_Activate.cpp

 # End Source File

 # Begin Source File

 

@@ -206,10 +226,30 @@ SOURCE=.\FaultTolerance\FT_Service_Callbacks.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\FaultTolerance\fault_tol_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ClientORBInitializer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ClientPolicy_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ClientPolicyFactory.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\FaultTolerance\FT_ClientRequest_Interceptor.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\FaultTolerance\FT_ClientService_Activate.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\FT_CORBA_ORBC.h

 # End Source File

 # Begin Source File

@@ -230,15 +270,23 @@ SOURCE=.\FaultTolerance\FT_IOGR_Property.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_ORBInitializer.h

+SOURCE=.\FaultTolerance\FT_ServerORBInitializer.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Policy_i.h

+SOURCE=.\FaultTolerance\FT_ServerPolicy_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_PolicyFactory.h

+SOURCE=.\FaultTolerance\FT_ServerPolicyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ServerRequest_Interceptor.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FaultTolerance\FT_ServerService_Activate.h

 # End Source File

 # Begin Source File

 

@@ -258,31 +306,31 @@ SOURCE=.\FaultTolerance\ftconf.h
 # PROP Default_Filter ".i"

 # Begin Source File

 

-SOURCE=.\FT_CORBA_ORBC.i

+SOURCE=.\FaultTolerance\FT_ClientPolicy_i.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\FT_CORBA_ORBS.i

+SOURCE=.\FT_CORBA_ORBC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Invocation_Endpoint_Selectors.inl

+SOURCE=.\FT_CORBA_ORBS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_IOGR_Property.i

+SOURCE=.\FaultTolerance\FT_Invocation_Endpoint_Selectors.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Policy_i.i

+SOURCE=.\FaultTolerance\FT_IOGR_Property.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Policy_i.inl

+SOURCE=.\FaultTolerance\FT_ServerPolicy_i.inl

 # End Source File

 # Begin Source File

 

-SOURCE=.\FaultTolerance\FT_Service_Callbacks.i

+SOURCE=.\FaultTolerance\FT_Service_Callbacks.inl

 # End Source File

 # End Group

 # Begin Group "IDL Files"

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 1b842e1bf48..7cf040cc690 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -4,6 +4,7 @@
 #include "tao/IOP_IORC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/DynamicC.h"
+#include "tao/Typecode.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 643f512b151..40450fe4bf4 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -189,7 +189,7 @@ TAO_FT_Service_Callbacks::raise_comm_failure (
           TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
           errno),
       CORBA::COMPLETED_MAYBE),
-      TAO_INVOKE_EXCEPTION);
+      TAO::TAO_INVOKE_SYSTEM_EXCEPTION);
 }
 
 TAO::Invocation_Status
@@ -209,7 +209,7 @@ TAO_FT_Service_Callbacks::raise_transient_failure (
           TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
           errno),
       CORBA::COMPLETED_MAYBE),
-      TAO_INVOKE_EXCEPTION);
+      TAO::TAO_INVOKE_SYSTEM_EXCEPTION);
 }
 
 CORBA::Boolean