diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-06 20:26:38 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-06 20:26:38 +0000 |
| commit | 2f8421756a55e57a3c22e0a07c19b95ed7eadffe (patch) | |
| tree | 3143ba6ea450f1b13066fd059e42ed4f55e9480a | |
| parent | b738d1ab7d4b0122113b77a6409aa5ed376151cf (diff) | |
| download | ATCD-2f8421756a55e57a3c22e0a07c19b95ed7eadffe.tar.gz | |
ChangeLogTag:Wed Sep 6 13:15:39 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/Adapter.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.cpp | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4273baff111..02a0feb81cb 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Sep 6 13:15:39 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/Adapter.cpp: + * tao/PortableServer/POA.cpp: + The tests were failing under minimum CORBA. To support + dynamically loadable object adapters we must enable the object + key prefix, even under minimum CORBA builds. + Tue Sep 5 18:42:07 2000 Carlos O'Ryan <coryan@uci.edu> * tao/PortableServer/ORB_Manager.h: diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index caffa545f3b..b3f4d1b552b 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -137,9 +137,11 @@ TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key, // If ObjectID not in table or reference is nil raise // OBJECT_NOT_EXIST. - if (status == -1 || CORBA::is_nil (forward_to)) + if (status == -1) ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); #endif /* TAO_NO_IOR_TABLE */ + if (CORBA::is_nil (forward_to)) + ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } CORBA::Object_ptr diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 71c4fc7d175..62799e2b0c1 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -2522,11 +2522,9 @@ TAO_POA::parse_key (const TAO_ObjectKey &key, // Get the object key octets. const CORBA::Octet *key_data = key.get_buffer (); -#if (TAO_NO_IOR_TABLE == 0) // Skip the object key prefix since we have already checked for // this. starting_at += TAO_OBJECTKEY_PREFIX_SIZE; -#endif /* TAO_NO_IOR_TABLE */ // Check the root indicator. char root_key_type = key_data[starting_at]; @@ -2651,9 +2649,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) { // Calculate the prefix size. CORBA::ULong prefix_size = 0; -#if (TAO_NO_IOR_TABLE == 0) prefix_size += TAO_OBJECTKEY_PREFIX_SIZE; -#endif /* TAO_NO_IOR_TABLE */ // If we are dealing with a persistent POA and user ids are being // used, then we need to add the POA name length field to the object @@ -2706,14 +2702,12 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) // Keeps track of where the next infomation goes; start at 0 byte. CORBA::ULong starting_at = 0; -#if (TAO_NO_IOR_TABLE == 0) // Add the object key prefix. ACE_OS::memcpy (&buffer[starting_at], &objectkey_prefix[0], TAO_OBJECTKEY_PREFIX_SIZE); starting_at += TAO_OBJECTKEY_PREFIX_SIZE; -#endif /* TAO_NO_IOR_TABLE */ // Copy the root byte. buffer[starting_at] = (CORBA::Octet) this->root_key_type (); |