*** empty log message ***

4 files changed, 43 insertions, 26 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 3ebf1cade66..8e30425cd66 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,7 +1,11 @@
+Fri Feb  5 15:25:56 1999 Fred Kuhns <fredk@cs.wustl.edu>
+        * Chnaged IIOP_Core.{h,cpp} and IIOP_ORB.cpp to use 
+          ACE_INET_Addr in the hash map rather than ACE_Addr.
+
 Fri Feb  5 14:45:25 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
        	* MProfile.{h,cpp} Added descriptive comments and fixed several
- 	 cases of mixing int's with unsigned int's.
+          cases of mixing int's with unsigned int's.
 
 Fri Feb  5 14:21:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp
index 1a02f36ca77..456f153ab71 100644
--- a/TAO/tao/IIOP_ORB.cpp
+++ b/TAO/tao/IIOP_ORB.cpp
@@ -268,8 +268,21 @@ IIOP_ORB::_get_collocated_servant (STUB_Object *sobj)
 
       // Check if the object requested is a collocated object.
       // @@ FRED - can we make this more generic!!
-      TAO_POA *poa = TAO_ORB_Core_instance ()->
-        get_collocated_poa (pfile->object_addr());
+      TAO_POA *poa = 0;
+      if (pfile->tag () == TAO_IOP_TAG_INTERNET_IOP)
+        {
+          ACE_INET_Addr &addr =
+                 ACE_dynamic_cast (ACE_INET_Addr &,
+                                   pfile->object_addr());
+    
+          TAO_POA *poa = TAO_ORB_Core_instance ()->
+            get_collocated_poa (addr);
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR,
+		        "get_collocated_poa NOT Supported for NON-IIOP profile!\n"));
+        }
 
       if (poa != 0)
         {
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4a21fa8802e..fb735261651 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -889,7 +889,7 @@ TAO_ORB_Core::add_to_collocation_table (void)
 }
 
 TAO_POA *
-TAO_ORB_Core::get_collocated_poa (ACE_Addr &addr)
+TAO_ORB_Core::get_collocated_poa (ACE_INET_Addr &addr)
 {
   if (this->using_collocation ())
     {
@@ -1546,16 +1546,16 @@ template class ACE_TSS<TAO_Resource_Factory::Pre_Allocated>;
 template class ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
 template class ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
 template class ACE_TSS<TAO_Resource_Factory::App_Allocated>;
-template class ACE_Hash_Map_Manager<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Manager_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Entry<ACE_Addr, TAO_POA *>;
-template class ACE_Hash<ACE_Addr>;
-template class ACE_Equal_To<ACE_Addr>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Iterator<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_POA *>;
+template class ACE_Hash<ACE_INET_Addr>;
+template class ACE_Equal_To<ACE_INET_Addr>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
 template class ACE_Guard<TAO_Collocation_Table_Lock>;
 template class ACE_Read_Guard<TAO_Collocation_Table_Lock>;
 template class ACE_Write_Guard<TAO_Collocation_Table_Lock>;
@@ -1605,16 +1605,16 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token>
 #pragma instantiate ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_TSS<TAO_Resource_Factory::App_Allocated>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Addr, TAO_POA *>
-#pragma instantiate ACE_Hash<ACE_Addr>
-#pragma instantiate ACE_Equal_To<ACE_Addr>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Addr, TAO_POA *, ACE_Hash<ACE_Addr>, ACE_Equal_To<ACE_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_POA *>
+#pragma instantiate ACE_Hash<ACE_INET_Addr>
+#pragma instantiate ACE_Equal_To<ACE_INET_Addr>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Guard<TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Read_Guard<TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Write_Guard<TAO_Collocation_Table_Lock>
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 86ac4e17843..3c7d5a85018 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -31,7 +31,7 @@ public:
 };
 
 // @@ Will this work, changing ACE_INET_Addr to ACE_Addr??
-typedef ACE_Hash_Map_Manager<ACE_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+typedef ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
         TAO_GLOBAL_Collocation_Table;
 
 class TAO_Cached_Connector_Lock : public ACE_Adaptive_Lock
@@ -177,7 +177,7 @@ public:
   int add_to_collocation_table (void);
   // Added this ORB into collocation table.
 
-  TAO_POA *get_collocated_poa (ACE_Addr &addr);
+  TAO_POA *get_collocated_poa (ACE_INET_Addr &addr);
   // See if we have a collocated address, if yes, return the POA
   // associated with the address.