Tue Jun 3 15:19:18 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

2 files changed, 33 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 85a934a6a3e..de103a66235 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun  3 15:19:18 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/LocalObject.html:
+          TAO to the 1.2 IDL to C++ mapping. LocalObject is now
+          refcounted by default. Updated the documentation to reflect
+          the changes.
+          
 Tue Jun  3 15:15:10 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * tao/Transport_Connector.h:
@@ -449,7 +456,6 @@ Tue May 20 12:13:16 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
           When retrieving the connection handler, check the result of the
           dynamic_cast and throw a NoContext exception if it is zero.
 
->>>>>>> .r81754
 Mon May 19 18:34:21 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Object.cpp:
@@ -597,7 +603,6 @@ Tue May 13 07:37:10 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
         * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
           Layout change
 
->>>>>>> .r81736
 Mon May 12 15:51:28 UTC 2008  Vladimir Zykov  <vzykov@prismtech.com>
 
         * tao/Stub.cpp:
@@ -1540,7 +1545,7 @@ Mon Apr 28 14:24:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
         * tests/TransportCurrent/lib/Server_ORBInitializer.h
         * tests/TransportCurrent/lib/Server_Request_Interceptor.h
           Don't use TAO_Local_RefCounted_Object but ::CORBA::LocalObject now
-          LocalObject is also refcounted. Users can still sue TAO_Local_RefCounted_Object,
+          LocalObject is also refcounted. Users can still use TAO_Local_RefCounted_Object,
           it just does nothing, actions have been takin in LocalObject.h
           to prevent the usage of TAO_Local_RefCounted_Object in the
           TAO distribution itself
diff --git a/TAO/docs/LocalObject.html b/TAO/docs/LocalObject.html
index 8aaa9e72727..f2cb0adc548 100644
--- a/TAO/docs/LocalObject.html
+++ b/TAO/docs/LocalObject.html
@@ -32,7 +32,7 @@ information on things to notice and common pitfalls.</p>
       declaration of the implementation class is something like this:
 <pre>
 
-        class FOOBAR_i : public POA_FOOBAR
+        class FOOBAR_i : public virtual POA_FOOBAR
         {
           .  .  .
         };
@@ -42,15 +42,33 @@ information on things to notice and common pitfalls.</p>
       the implementation class is defined as:
 <pre>
 
-        class FOOBAR_i : public FOOBAR,
-                         public CORBA::LocalObject
+        class FOOBAR_i : public virtual FOOBAR,
+                         public virtual CORBA::LocalObject
         {
           .  .  .
         };
 
 </pre></p>
 
-  <li><p><b>Reference Counting and Object Reference Lifecycle</b> -
+  <li><p><b>Reference Counting and Object Reference Lifecycle 
+      (TAO 1.6.5 and above, which followed the IDL->C++ mapping version 1.2)</b> -
+      TAO 1.6.5 and above has been updated to the 1.2 IDL to C++ mapping.
+      LocalObject is now refcounted by default. Regular CORBA object
+      references use reference counting to manage lifecycle of object
+      references. Local object references also use reference counting
+      for lifecycle management. In that respect, Local Objects behave
+      exactly as Regular CORBA objects do, and the memory management
+      rules that apply to Regular CORBA objects apply to Local Objects
+      </p>
+
+      <p>If, for some reason, you would like to preserve the originial 
+      behavior (i.e., disabling reference counting) then override 
+      <code>_add_ref ()</code> and <code>_remove_ref
+      ()</code> and implement them as no-op operations.</p>
+
+
+  <li><p><b>Reference Counting and Object Reference Lifecycle (Prior to 
+            TAO 1.6.5, which followed the IDL->C++ mapping version 1.1)</b> -
       Regular CORBA object references use reference counting to manage
       lifecycle of object references.  Local object references
       <b>may</b> also use reference counting for lifecycle
@@ -82,8 +100,8 @@ information on things to notice and common pitfalls.</p>
       <code>TAO_Local_Ref_Counted_Object ()</code> as:
 
       <pre>
-       class FOOBAR_i : public FOOBAR,
-                        public TAO_Local_Ref_Counted_Object
+       class FOOBAR_i : public virtual FOOBAR,
+                        public virtual TAO_Local_Ref_Counted_Object
        {
           .  .  .
        };
@@ -92,13 +110,12 @@ information on things to notice and common pitfalls.</p>
       if you wish to use reference counting.  However,
       this is not portable and should be used with care by the applications.</p>
 
-
 </ul>
 
 
 <hr>
 <address></address>
 <!-- hhmts start -->
-Last modified: Wed Apr 26 02:21:35 Central Daylight Time 2000
+Last modified: Tue Jun  3 15:19:18 UTC 2008
 <!-- hhmts end -->
 </body> </html>