ChangeLogTag: Tue Feb 21 17:48:24 UTC 2006 Simon McQueen <sm@prismtech.com>

1 files changed, 9 insertions, 20 deletions

diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 4805cc006aa..fc1a51490d6 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -279,9 +279,13 @@ namespace CORBA
     static CORBA::Boolean marshal (Object_ptr obj,
                                    TAO_OutputCDR &strm);
 
+    /// Accessor for the cached servant reference held on the stub
+    /// if this object is collocated
     virtual TAO_Abstract_ServantBase *_servant (void) const;
 
     /// Is this object collocated with the servant?
+    /// Note this does not return this->is_collocated_ but will instead
+    /// query the underlying stub for its collocation status
     virtual CORBA::Boolean _is_collocated (void) const;
 
     /// Is this a local object?
@@ -353,31 +357,18 @@ namespace CORBA
     /// Initializing a local object.
     Object (int dummy = 0);
 
+    /// Convenience accessor for the object proxy broker of the
+    /// underlying stub.
+    TAO::Object_Proxy_Broker *proxy_broker () const;
+
   private:
 
     // = Unimplemented methods
     Object (const Object &);
     Object &operator = (const Object &);
 
-  protected:
-
-    /// Servant pointer.  It is 0 except for collocated objects.
-    TAO_Abstract_ServantBase *servant_;
-
   private:
 
-    /// Pointer to the Proxy Broker
-    /**
-     * This cached pointer instance takes care of routing the call for
-     * standard calls in CORBA::Object like _is_a (), _get_component
-     * () etc.
-     */
-    TAO::Object_Proxy_Broker *proxy_broker_;
-
-    /// Flag to indicate collocation.  It is 0 except for collocated
-    /// objects.
-    CORBA::Boolean is_collocated_;
-
     /// Specify whether this is a local object or not.
     CORBA::Boolean is_local_;
 
@@ -452,9 +443,7 @@ namespace TAO
 /// library is present.
 extern
   TAO_Export TAO::Object_Proxy_Broker *
-  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-      CORBA::Object_ptr obj
-    );
+  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void);
 
 TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::Object*);