summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-13 05:08:22 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-13 05:08:22 +0000
commit2278f6a421fa08943b895ba3e74b613e77dbc26a (patch)
tree0700e5f2838e0b09b6430e432fd51ea835067206 /TAO
parent2e58fd45de807b8d86210b7a2c29841dd2637d2d (diff)
downloadATCD-2278f6a421fa08943b895ba3e74b613e77dbc26a.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog-98c10
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp4
-rw-r--r--TAO/tao/ORB.i2
3 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 4cb5ff597c7..7edbeeb5a50 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,4 +1,12 @@
-Tue May 12 17:13:23 1998 Irfan Pyarali <irfan@cs.wustl.edu>
+Wed May 13 00:05:52 1998 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * tao/ORB.i (orb_free_resources): This should return
+ !CORBA_ORB::orb_init_count_ instead of simply
+ CORBA_ORB::orb_init_count_. Thanks to Pavel Motuzenko
+ (p_motuzenko@hotmail.com) for pointing these two problems out.
+
+ * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Server):
+ Fixed the initialization of naming_context_name_.
* tests/POA/Forwarding/: Added new test that shows the forwarding
features in TAO.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 119a0c1a799..4b1bd11f52f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -25,8 +25,8 @@
// Default constructor
TAO_Naming_Server::TAO_Naming_Server (void)
- : ior_multicast_ (0),
- naming_context_name_ ("NameService")
+ : ior_multicast_ (0),
+ naming_context_name_ (CORBA::string_dup ("NameService"))
{
}
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index e1fef857e2b..334f220ca98 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -206,7 +206,7 @@ CORBA_ORB::work_pending (void)
ACE_INLINE CORBA::Boolean
CORBA_ORB::orb_free_resources (void)
{
- return CORBA_ORB::orb_init_count_;
+ return !CORBA_ORB::orb_init_count_;
}
// *************************************************************