summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/ImplRepo_Service
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp64
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h26
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Makefile106
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Repository.h25
4 files changed, 113 insertions, 108 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 5b3607b1a2a..ac2f643d464 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -23,7 +23,7 @@ CORBA::Object_ptr
ImplRepo_i::activate_object (CORBA::Object_ptr obj,
CORBA::Environment &ACE_TRY_ENV)
{
- /* Implementation_Repository::INET_Addr *new_addr; */
+ Implementation_Repository::INET_Addr *new_addr;
TAO_Stub *new_stub_obj = 0;
if (OPTIONS::instance()->debug () >= 1)
@@ -34,7 +34,7 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
ACE_TRY
{
// @@ Where to get the poa name from?
- /* new_addr = */ this->activate_server (0, ACE_TRY_ENV);
+ new_addr = this->activate_server (0, ACE_TRY_ENV);
ACE_TRY_CHECK;
// @@ Use auto_ptr<> to avoid memory leaks!
@@ -43,7 +43,11 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
ACE_dynamic_cast (TAO_IIOP_Profile *,
stub_obj->profile_in_use ());
- TAO_MProfile mp(1);
+ TAO_MProfile *mp;
+ ACE_NEW_THROW_EX (mp,
+ TAO_MProfile (1),
+ CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
+ ACE_CHECK_RETURN (CORBA::Object::_nil ());
TAO_Profile *new_pfile;
// @@ Would new_addr->host_ be different from object_addr()?
@@ -52,8 +56,8 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
TAO_IIOP_Profile (iiop_pfile->object_addr (),
iiop_pfile->object_key ()),
CORBA::Object::_nil ());
-
- mp.give_profile (new_pfile);
+
+ mp->give_profile (new_pfile);
// create new obj, pfile will be copied!
new_stub_obj = new TAO_Stub (stub_obj->type_id,
@@ -346,7 +350,7 @@ ImplRepo_i::server_is_running (const char *server,
ACE_NEW_RETURN (rec.host, ASYS_TCHAR[ACE_OS::strlen (addr.host_.in ()) + 1], 0);
ACE_OS::strcpy (rec.host, addr.host_.in ());
rec.port = addr.port_;
-
+
ASYS_TCHAR *ping_ior = this->orb_manager_.orb ()->object_to_string (ping, ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
@@ -657,32 +661,51 @@ void
IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
CORBA::Environment &ACE_TRY_ENV)
{
- TAO_ORB_Core *orb_core = this->orb_var_->orb_core ();
- TAO_POA_Current_Impl *poa_current_impl = orb_core->poa_current ().implementation ();
+ // Get the POA Current object reference
+ CORBA::Object_var obj = this->orb_var_->resolve_initial_references ("POACurrent");
+
+ TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
+ TAO_POA_Current *poa_current = orb_core->poa_current ();
+
+ if (ACE_TRY_ENV.exception () != 0)
+ {
+ ACE_TRY_ENV.print_exception ("PortableServer::Current::_narrow");
+ return;
+ }
// The servant determines the key associated with the database entry
// represented by self
- PortableServer::ObjectId_var oid = poa_current_impl->get_object_id (ACE_TRY_ENV);
- ACE_CHECK;
+ PortableServer::ObjectId_var oid = poa_current->get_object_id (ACE_TRY_ENV);
+ if (ACE_TRY_ENV.exception () != 0)
+ return;
// Now convert the id into a string
CORBA::String_var key = PortableServer::ObjectId_to_string (oid.in ());
- PortableServer::POA_ptr poa = poa_current_impl->get_POA (ACE_TRY_ENV);
- ACE_CHECK;
+ PortableServer::POA_ptr poa = poa_current->get_POA (ACE_TRY_ENV);
+ if (ACE_TRY_ENV.exception () != 0)
+ return;
// Now FORWARD!!!
Implementation_Repository::INET_Addr *new_addr = 0;
- new_addr = this->ir_impl_->activate_server (poa->the_name (),
- ACE_TRY_ENV);
- ACE_CHECK;
+
+ ACE_TRY
+ {
+ new_addr = this->ir_impl_->activate_server (poa->the_name (),
+ ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+ }
+ ACE_CATCHANY
+ {
+ ACE_RETHROW;
+ }
+ ACE_ENDTRY;
CORBA_Object_ptr forward_object =
- this->orb_var_->key_to_object (poa_current_impl->object_key (),
+ this->orb_var_->key_to_object (poa_current->object_key (),
0,
ACE_TRY_ENV);
- ACE_CHECK;
TAO_Stub *stub_obj = ACE_dynamic_cast (TAO_Stub *,
forward_object->_stubobj ());
@@ -694,8 +717,13 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
iiop_pfile->port (new_addr->port_);
iiop_pfile->host (new_addr->host_);
+// if (TAO_debug_level > 0)
+// ACE_DEBUG ((LM_DEBUG,
+// "The forward_to is <%s>\n",
+// this->orb_var_->object_to_string (forward_object, ACE_TRY_ENV)));
+
if (!CORBA::is_nil (forward_object))
- ACE_THROW (PortableServer::ForwardRequest (forward_object));
+ ACE_TRY_ENV.exception (new PortableServer::ForwardRequest (forward_object));
else
ACE_ERROR ((LM_ERROR,
"Error: Forward_to reference is nil.\n"));
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index 9c3466006f0..ff8fb169ce1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -17,7 +17,7 @@
//
// ============================================================================
-#ifndef IMPLREPO_I_H
+#if !defined (IMPLREPO_I_H)
#define IMPLREPO_I_H
#include "orbsvcs/ImplRepoS.h"
@@ -47,7 +47,7 @@ public:
virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
const char *name,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// Called by the POA when the incoming requested object/POA isn't found. This will
// create POAs when needed and will also put a DSI object (IR_Forwarder) in that POA
@@ -73,9 +73,9 @@ public:
// = Interface methods
virtual CORBA::Object_ptr activate_object (CORBA::Object_ptr obj,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
- // Starts up the server containing the object <obj> if not already running.
+ // Starts up the server containing the object <obj> if not already running.
virtual Implementation_Repository::INET_Addr *activate_server (const char *server,
CORBA::Environment &env);
@@ -83,40 +83,40 @@ public:
virtual void register_server (const char *server,
const Implementation_Repository::Process_Options &options,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
- // Adds the server to the repository and registers the startup information about
+ // Adds the server to the repository and registers the startup information about
// the server <server>.
virtual void reregister_server (const char *server,
const Implementation_Repository::Process_Options &options,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// Updates the startup information about the server <server>.
virtual void remove_server (const char *server,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// Removes the server <server> from the repository.
- virtual Implementation_Repository::INET_Addr
+ virtual Implementation_Repository::INET_Addr
*server_is_running (const char *server,
const Implementation_Repository::INET_Addr &addr,
CORBA::Object_ptr ping,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// Called by the server to update transient information such as current location of
// the <server> and its ping object.
virtual void server_is_shutting_down (const char * server,
- CORBA_Environment &ACE_TRY_ENV
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// What the server should call before it shutsdown.
// = Other methods
- int init (int argc, char **argv,
- CORBA_Environment &ACE_TRY_ENV
+ int init (int argc, char **argv,
+ CORBA_Environment &ACE_TRY_ENV
= CORBA_Environment::default_environment ());
// Initialize the Server state - parsing arguments and waiting.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index 17b4781e9ba..5a2ff688ffd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -76,6 +76,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/corba.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
@@ -139,7 +140,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/try_macros.h \
$(TAO_ROOT)/tao/orbconf.h \
$(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
$(TAO_ROOT)/tao/Environment.h \
$(TAO_ROOT)/tao/Environment.i \
$(TAO_ROOT)/tao/ORB.h \
@@ -172,38 +172,36 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(ACE_ROOT)/ace/Reactor.i \
$(ACE_ROOT)/ace/Reactor_Impl.h \
$(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
$(TAO_ROOT)/tao/ORB.i \
$(TAO_ROOT)/tao/Any.h \
$(TAO_ROOT)/tao/CDR.h \
$(TAO_ROOT)/tao/Typecode.h \
$(TAO_ROOT)/tao/Typecode.i \
$(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Any.i \
$(TAO_ROOT)/tao/NVList.h \
$(TAO_ROOT)/tao/NVList.i \
$(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
$(TAO_ROOT)/tao/Principal.i \
$(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/Request.i \
$(TAO_ROOT)/tao/Server_Request.h \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
$(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
$(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/varout.h \
$(TAO_ROOT)/tao/varout.i \
$(TAO_ROOT)/tao/varout.cpp \
@@ -226,8 +224,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/POA_CORBA.h \
$(TAO_ROOT)/tao/DynAnyC.h \
$(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/POAS.i \
$(TAO_ROOT)/tao/Active_Object_Map.h \
$(TAO_ROOT)/tao/Key_Adapters.h \
@@ -316,25 +312,24 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/POAManager.i \
$(TAO_ROOT)/tao/Object_Adapter.h \
$(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
$(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
$(TAO_ROOT)/tao/IIOP_Connector.h \
$(ACE_ROOT)/ace/Connector.h \
$(ACE_ROOT)/ace/Connector.i \
$(ACE_ROOT)/ace/Connector.cpp \
$(ACE_ROOT)/ace/SOCK_Connector.h \
$(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
$(TAO_ROOT)/tao/ORB_Core.i \
$(ACE_ROOT)/ace/Dynamic_Service.h \
$(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
$(TAO_ROOT)/tao/Operation_Table.h \
$(TAO_ROOT)/tao/Client_Strategy_Factory.h \
$(TAO_ROOT)/tao/Invocation.h \
@@ -342,13 +337,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
$(TAO_ROOT)/tao/DynAny_i.h \
$(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
@@ -370,6 +358,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/corba.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
@@ -433,7 +422,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/try_macros.h \
$(TAO_ROOT)/tao/orbconf.h \
$(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
$(TAO_ROOT)/tao/Environment.h \
$(TAO_ROOT)/tao/Environment.i \
$(TAO_ROOT)/tao/ORB.h \
@@ -466,38 +454,36 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(ACE_ROOT)/ace/Reactor.i \
$(ACE_ROOT)/ace/Reactor_Impl.h \
$(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
$(TAO_ROOT)/tao/ORB.i \
$(TAO_ROOT)/tao/Any.h \
$(TAO_ROOT)/tao/CDR.h \
$(TAO_ROOT)/tao/Typecode.h \
$(TAO_ROOT)/tao/Typecode.i \
$(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Any.i \
$(TAO_ROOT)/tao/NVList.h \
$(TAO_ROOT)/tao/NVList.i \
$(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
$(TAO_ROOT)/tao/Principal.i \
$(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/Request.i \
$(TAO_ROOT)/tao/Server_Request.h \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
$(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
$(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/varout.h \
$(TAO_ROOT)/tao/varout.i \
$(TAO_ROOT)/tao/varout.cpp \
@@ -520,8 +506,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/POA_CORBA.h \
$(TAO_ROOT)/tao/DynAnyC.h \
$(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/POAS.i \
$(TAO_ROOT)/tao/Active_Object_Map.h \
$(TAO_ROOT)/tao/Key_Adapters.h \
@@ -610,25 +594,24 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/POAManager.i \
$(TAO_ROOT)/tao/Object_Adapter.h \
$(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
$(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
$(TAO_ROOT)/tao/IIOP_Connector.h \
$(ACE_ROOT)/ace/Connector.h \
$(ACE_ROOT)/ace/Connector.i \
$(ACE_ROOT)/ace/Connector.cpp \
$(ACE_ROOT)/ace/SOCK_Connector.h \
$(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
$(TAO_ROOT)/tao/ORB_Core.i \
$(ACE_ROOT)/ace/Dynamic_Service.h \
$(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
$(TAO_ROOT)/tao/Operation_Table.h \
$(TAO_ROOT)/tao/Client_Strategy_Factory.h \
$(TAO_ROOT)/tao/Invocation.h \
@@ -636,13 +619,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
$(TAO_ROOT)/tao/DynAny_i.h \
$(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
@@ -668,6 +644,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(ACE_ROOT)/ace/Hash_Map_Manager.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
@@ -755,6 +732,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.h b/TAO/orbsvcs/ImplRepo_Service/Repository.h
index 1253be51e7b..a1c4a23798f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.h
@@ -5,7 +5,7 @@
//
// = LIBRARY
// TAO/orbsvcs/ImplRepo_Service
-//
+//
// = FILENAME
// Repository.h
//
@@ -14,15 +14,14 @@
//
// = AUTHOR
// Darrell Brunsch <brunsch@cs.wustl.edu>
-//
+//
// ============================================================================
-#ifndef REPOSITORY_H
+#if !defined (REPOSITORY_H)
#define REPOSITORY_H
#include "ace/Hash_Map_Manager.h"
#include "ace/Synch.h"
-#include "ace/SString.h"
#if defined (UNICODE)
#define ACE_TString ACE_WString
@@ -64,19 +63,19 @@ public:
Repository ();
// Default Constructor
- typedef ACE_Hash_Map_Entry<ACE_TString,
+ typedef ACE_Hash_Map_Entry<ACE_TString,
Repository_Record *> HASH_IR_ENTRY;
- typedef ACE_Hash_Map_Manager_Ex<ACE_TString,
- Repository_Record *,
- ACE_Hash<ACE_TString>,
- ACE_Equal_To<ACE_TString>,
+ typedef ACE_Hash_Map_Manager_Ex<ACE_TString,
+ Repository_Record *,
+ ACE_Hash<ACE_TString>,
+ ACE_Equal_To<ACE_TString>,
ACE_Null_Mutex> HASH_IR_MAP;
typedef ACE_Hash_Map_Iterator_Ex<ACE_TString,
- Repository_Record *,
- ACE_Hash<ACE_TString>,
- ACE_Equal_To<ACE_TString>,
+ Repository_Record *,
+ ACE_Hash<ACE_TString>,
+ ACE_Equal_To<ACE_TString>,
ACE_Null_Mutex> HASH_IR_ITER;
int add (ACE_TString key, const Repository_Record &rec);
@@ -84,7 +83,7 @@ public:
int update (ACE_TString key, const Repository_Record &rec);
// Updates an existing key with <rec>
-
+
int remove (ACE_TString key);
// Removes the server from the Repository
View Lorry Controller Status