diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-22 03:30:14 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-22 03:30:14 +0000 |
| commit | ea3cbeee0323707bbbc86a1b57022547b4fff53b (patch) | |
| tree | bba7f4d04a97b375dc9cc9131febf6a0b25e138c | |
| parent | 1ef03f54e2cb64c9a1d7a5074638c58f7f45bc72 (diff) | |
| download | ATCD-ea3cbeee0323707bbbc86a1b57022547b4fff53b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 273b4c7f527..4ce148f50a5 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,8 @@ +Mon Sep 21 22:24:45 1998 Irfan Pyarali <irfan@cs.wustl.edu> + + * orbsvcs/orbsvcs/Naming/Naming_Utils.h (TAO_Naming_Client): Added + timeout to init(). + Mon Sep 21 21:44:39 1998 David L. Levine <levine@cs.wustl.edu> * tao/CDR.i,tao/Connect.cpp, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index fcf2722d88e..f31ff6952e7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -225,12 +225,13 @@ TAO_Naming_Client::get_context (void) const } int -TAO_Naming_Client::init (CORBA::ORB_ptr orb) +TAO_Naming_Client::init (CORBA::ORB_ptr orb, + ACE_Time_Value *timeout) { TAO_TRY { CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService", timeout); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index 7d9a538e194..ba9227e6534 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -113,7 +113,8 @@ public: TAO_Naming_Client (void); // Default constructor. - int init (CORBA::ORB_ptr orb); + int init (CORBA::ORB_ptr orb, + ACE_Time_Value *timeout = 0); // Initialize the name server. ~TAO_Naming_Client (void); |