diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f58f780924e..cb9529b8cb3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri May 23 15:35:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Object.cpp (is_nil_i): Added a new conditional check for + null objects in partially evaluated IOR's. + Fri May 23 15:18:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * TAO_IDL/be_interface.cpp: diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index d0678a288bd..30c2b1351b5 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -371,6 +371,12 @@ CORBA::Object::_proxy_broker (void) CORBA::Boolean CORBA::Object::is_nil_i (CORBA::Object_ptr obj) { + // If the profile length is zero for a non-evaluted IOR it is a + // null-object. + if ((!obj->is_evaluated ()) && + obj->ior ().profiles.length () == 0) + return 1; + // To accomodate new definitions. if (obj->orb_core_) { |