Bug 1496

Summary:	Redirect calls to collocated servants
Product:	TAO	Reporter:	Carlos O'Ryan <coryan>
Component:	ORB	Assignee:	Johnny Willemsen <jwillemsen>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	P3
Version:	1.3.1
Hardware:	All
OS:	All
Bug Depends on:	1369
Bug Blocks:	133

Description Carlos O'Ryan 2003-04-21 11:48:06 CDT

If a invocation is location forwarded to a colocated servant we need to switch
from the remote path (via Invocation classes) to the collocated path.  With the
current code structure I do not believe it is possible to do this, but once bug
1369 is fixed I believe it would be relatively simply to select either path.

Basically this is how it would work:  the Invocation classes wrap all the code
to make remote calls.  Suppose a LOCATION_FORWARD message is received while
making the call.  If the new code described in bug 1369 was in place the
Invocation class could detect that the new object is colocated, since bug 1369
prescribes that all the collocation code is in the library already (i.e. there
are no special Stubs for colocated objects) the library path for colocated calls
is used.

Comment 1 Carlos O'Ryan 2003-04-21 11:51:13 CDT

As described in the original report, the suggestions to fix this bug depend on 1369.

Comment 2 Nanbor Wang 2003-05-07 22:54:23 CDT

Accepted for tao-support

Comment 3 Johnny Willemsen 2004-04-05 01:49:32 CDT

this one will be mine

Comment 4 Johnny Willemsen 2004-04-05 01:49:42 CDT

accept

Comment 5 Johnny Willemsen 2004-06-18 05:45:45 CDT

Also fixed by the change below. 

Thu Apr 22 06:48:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>

        * tao/Collocated_Invocation.cpp:
        * tao/Collocated_Invocation.h:
          Swapped the first arguments to target and then effective_target
          so that this matches the signature of the base class.

        * tao/Invocation_Adapter.cpp:
        * tao/Invocation_Adapter.h:
          Updated for the signature change of Collocated_Invocation. Also
          when we have a collocated proxy broker set we could by theory
          use a collocated invocation, so then use
          TAO_ORB_Core::collocation_strategy to see how the collocation
          strategy is set. Dependent on this we do a collocated or remote
          invocation. If is now possible that a remote invocation that
          gets a forward location to a collocated servant now switches
          from the remote invocation path to the collocated invocation path.
          This fixes Bug 1495. Thanks to Bala for helping me with this.

        * TAO_IDL/be/be_interface.cpp:
        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
        * TAO_IDL/be/be_visitor_operation/operation.cpp:
          Previously when a servant was remote, no collocated proxy broker
          was created, but by the change in Invocation_Adapter above it
          can happen that we get a forward reference to a collocated servant
          and then we need a collocated proxy broker. Changed the generated
          code that the cpb is set when there is a valid
          Proxy_Broker_Factory_function_pointer.

        * tao/DomainC.cpp
        * tao/DomainC.h
        * tao/DomainC.i
        * tao/PolicyC.cpp
        * tao/PolicyC.h
        * tao/PolicyC.i
        * tao/IFR_Client/IFR_BaseC.cpp
        * tao/IFR_Client/IFR_BaseC.h
        * tao/IFR_Client/IFR_BaseC.i
        * tao/IFR_Client/IFR_BasicC.cpp
        * tao/IFR_Client/IFR_BasicC.h
        * tao/IFR_Client/IFR_BasicC.i
        * tao/IFR_Client/IFR_ComponentsC.cpp
        * tao/IFR_Client/IFR_ComponentsC.h
        * tao/IFR_Client/IFR_ComponentsC.i
        * tao/IFR_Client/IFR_ExtendedC.cpp
        * tao/IFR_Client/IFR_ExtendedC.h
        * tao/IFR_Client/IFR_ExtendedC.i
        * tao/Messaging/MessagingC.cpp
        * tao/Messaging/MessagingC.h
        * tao/Messaging/MessagingC.i
        * tao/PortableServer/ImR_LocatorC.cpp
        * tao/PortableServer/ImR_LocatorC.h
        * tao/PortableServer/ImR_LocatorC.i
        * tao/PortableServer/ImplRepoC.cpp
        * tao/PortableServer/ImplRepoC.h
        * tao/PortableServer/ImplRepoC.i
          Regenerated these files because of the change of the signature
          of the setup_collocation method.

        * tests/Bug_1495_Regression/Bug_1495.mpc:
          Removed dummy_label so that this test is build.