ChangeLogTag: Sat Feb 22 09:50:31 2003 Ossama Othman <ossama@uci.edu>

2 files changed, 14 insertions, 5 deletions

diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog
index 68ce48c35dc..f668f8c0c33 100644
--- a/TAO/tao/ChangeLog
+++ b/TAO/tao/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 24 09:16:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tao/Object.cpp: The return value from the call to
+	  initialize_object () is voided since not much can be done at
+	  that point if failures occur. We will do error checking later to
+	  throw the right exceptions. 
+
 Fri Mar 21 17:07:11 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* tao/Adapter.h:
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index cddbdd69dc4..72cd364bdb1 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -673,6 +673,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
   if (obj->is_evaluated_)
     return;
 
+
   CORBA::ULong profile_count =
     obj->ior_->profiles.length ();
 
@@ -766,11 +767,12 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
   TAO_Stub_Auto_Ptr safe_objdata (objdata);
 
-  int retval =
-    orb_core->initialize_object (safe_objdata.get (),
-                                 obj);
-  if (retval == 0)
-    obj->protocol_proxy_ = objdata;
+  // No hope. What happens if this fails or returns an error? No
+  // chance to initialize the object again. Just give up. We will throw
+  // an exception when someone tries to access something..
+  (void) orb_core->initialize_object (safe_objdata.get (),
+                                      obj);
+  obj->protocol_proxy_ = objdata;
 
   // If the object is collocated then set the broker using the
   // factory otherwise use the remote proxy broker.