*** empty log message ***

4 files changed, 36 insertions, 8 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 150cc248324..81a6866e200 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -8,6 +8,7 @@ Sun Sep 27 00:58:31 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 Sun Sep 27 00:02:57 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tao/Object_Table and POA: 
+
 	  - Added no-op destructors to all class. g++ was having problems.
 	  
 	  - Moved the Hash_Map_Manager template specialization to the .i
@@ -21,6 +22,13 @@ Sun Sep 27 00:02:57 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
  	    contains the binary values for the index and the generation
  	    count.  This should make the parsing of the id faster.
 
+	  - Made sure that the POA policies are getting registered with
+ 	    the RootPOA rather than the creator POA.  This allows implicit
+ 	    activation of the policies.
+
+	  - There was a bug in create_object_id which was fixed by moving
+ 	    <next_> along if index is not reused.
+
 Sat Sep 26 20:25:18 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp: 
diff --git a/TAO/tao/Object_Table.cpp b/TAO/tao/Object_Table.cpp
index 308ecf817e7..5b181db28bc 100644
--- a/TAO/tao/Object_Table.cpp
+++ b/TAO/tao/Object_Table.cpp
@@ -254,6 +254,10 @@ TAO_Active_Demux_ObjTable::create_object_id (PortableServer::Servant servant,
 
   // Increment generation count
   id_data[TAO_Active_Demux_ObjTable::GENERATION_FIELD] = ++this->table_[index].generation_;
+  
+  // Move next along if index is not reused 
+  if (index == this->next_)
+    this->next_++;
 
   PortableServer::ObjectId &id = 
     *(new PortableServer::ObjectId (TAO_POA::MAX_SPACE_REQUIRED_FOR_TWO_CORBA_ULONG_TO_HEX));
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 75dd98984ac..a1c7b435766 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -133,11 +133,13 @@ TAO_Thread_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Thread_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
                                           PortableServer::POA_ptr poa)
@@ -203,11 +205,13 @@ TAO_Lifespan_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Lifespan_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
                                                     PortableServer::POA_ptr poa)
@@ -273,11 +277,13 @@ TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
                                                     PortableServer::POA_ptr poa)
@@ -343,11 +349,13 @@ TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
                                                                 PortableServer::POA_ptr poa)
@@ -413,11 +421,13 @@ TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
                                                             PortableServer::POA_ptr poa)
@@ -483,11 +493,13 @@ TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
                                                               PortableServer::POA_ptr poa)
@@ -553,11 +565,13 @@ TAO_Request_Processing_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Request_Processing_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 // **************************************************
 //
@@ -629,11 +643,13 @@ TAO_Synchronization_Policy::policy_type (CORBA::Environment &env)
   return 0;
 }
 
+/*
 PortableServer::POA_ptr
 TAO_Synchronization_Policy::_default_POA (CORBA::Environment &env)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+*/
 
 TAO_POA_Policies::TAO_POA_Policies (void)
   :  thread_ (PortableServer::ORB_CTRL_MODEL),
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index d69f35aa4ba..3a210600ea8 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -66,7 +66,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::ThreadPolicyValue value_;
@@ -90,7 +90,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::LifespanPolicyValue value_;
@@ -114,7 +114,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::IdUniquenessPolicyValue value_;
@@ -138,7 +138,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::IdAssignmentPolicyValue value_;
@@ -162,7 +162,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::ImplicitActivationPolicyValue value_;
@@ -186,7 +186,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::ServantRetentionPolicyValue value_;
@@ -210,7 +210,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::RequestProcessingPolicyValue value_;
@@ -240,7 +240,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());  
 
 protected:
   PortableServer::SynchronizationPolicyValue value_;