diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-21 22:52:07 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-21 22:52:07 +0000 |
| commit | b29eabab3f10f542c0ae937da15b811fff01c801 (patch) | |
| tree | 3ce4abd8f18bff2a539d3531b5ac1ca24ee84f70 /TAO/orbsvcs/orbsvcs/Notify | |
| parent | a8d29e92365ac1bff8be589b666d94a8f4b76913 (diff) | |
| download | ATCD-b29eabab3f10f542c0ae937da15b811fff01c801.tar.gz | |
ChangeLog: Mon Jul 21 15:41:09 2003 Pradeep Gore <pradeep@oomworks.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 10aafd0b757..a46e1f7fd65 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -22,6 +22,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" +#include "Object.h" /** * @class TAO_Notify_Find_Worker_T diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 7299bb672ef..0358e88b59a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -9,6 +9,7 @@ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$") #include "tao/debug.h" +#include "ID_Factory.h" TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) { @@ -16,7 +17,6 @@ TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper () { - } ACE_CString @@ -125,8 +125,11 @@ TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const CORBA::Object_ptr TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL) { + /// ID Factory for objects. + static TAO_Notify_ID_Factory id_factory; + // Generate a new ID. - id = this->id_factory_.id (); + id = id_factory.id (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in POA : %s\n", id, this->poa_->the_name ())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index f9c76d22c7f..44c38a774e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -21,7 +21,6 @@ #include "ace/Copy_Disabled.h" #include "tao/PortableServer/PortableServer.h" -#include "ID_Factory.h" /** * @class TAO_Notify_POA_Helper @@ -72,9 +71,6 @@ protected: /// POA PortableServer::POA_var poa_; - /// ID Factory for objects. - TAO_Notify_ID_Factory id_factory_; - /// Convert id to ObjectID PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const; }; |