diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-02 23:23:20 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-02 23:23:20 +0000 |
| commit | 655c1e1771a602c7ec949de331337e196d9adbfa (patch) | |
| tree | bdb708be027afa95092e3c308ef32d146c8f4049 | |
| parent | ac7d5b395c96478fab7a775fd1c097980d2705d1 (diff) | |
| download | ATCD-655c1e1771a602c7ec949de331337e196d9adbfa.tar.gz | |
ChangeLogTag: Tue Dec 2 17:21:43 2003 Dale Wilson <wilson_d@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7a2cb5cb0dd..ae915d03828 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 2 17:21:43 2003 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp: + Fix it the way bala fixed it in the main trunk. + + Tue Dec 2 14:34:51 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 764f4087c1c..1d9fe28950c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -81,11 +81,13 @@ TAO_FT_ClientORBInitializer::register_policy_factories ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; + /* type = FT::HEARTBEAT_ENABLED_POLICY; info->register_policy_factory (type, policy_factory.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; + */ // Transfer ownership of the policy factory to the registry. (void) policy_factory._retn (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index e7725a2b4e1..0cedc9c6d86 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -43,13 +43,10 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { -#if 0 // @@ client registers this. Is the client's policy factory ok in a server? // Register the FTCORBA policy factories. PortableInterceptor::PolicyFactory_ptr temp_factory = PortableInterceptor::PolicyFactory::_nil (); - - PortableInterceptor::PolicyFactory_var policy_factory; // This policy factory is used for all FTCORBA related policies. @@ -65,7 +62,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( policy_factory = temp_factory; - // Bind the same policy factory to all FTCORBA related policy // types since a single policy factory is used to create each of // the different types of FTCORBA policies. @@ -78,7 +74,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( ACE_CHECK; // Transfer ownership of the policy factory to the registry. (void) policy_factory._retn (); -#endif } |