summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-10 18:10:41 +0000
committerfhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-10 18:10:41 +0000
commitf788d1b3b030730adbada4e851734680894c8b53 (patch)
tree1ffc56b5aff8f3781a58fc3c36a8c8107abd2163
parentd8d341b74537b40524c507ef73ec49663fdab5bf (diff)
downloadATCD-f788d1b3b030730adbada4e851734680894c8b53.tar.gz
ChangeLogTag: Wed Jan 10 12:07:21 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tao/Policy_Manager.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3a57df27afc..deee849b0ef 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Wed Jan 10 12:07:21 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
+
+ * tao/Policy_Manager.cpp:
+ Reverted change by Darrell on Jan 8 since it was causing
+ the Timed_Buffered_Oneways and Timeout tests to fail under
+ the Linux and EGCS builds.
+
Tue Jan 9 14:31:12 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
* performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf:
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 572089de19a..616fa611e3f 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -287,7 +287,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides (
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
- CORBA::Policy_var policy = policies[i].in ();
+ CORBA::Policy_var policy = policies[i];
if (CORBA::is_nil (policy.in ()))
continue;