summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-06-28 16:07:02 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-06-28 16:07:02 +0000
commit61da23efa77c07b3acb496c2d2d70f7b01d6267f (patch)
treed8ed157137a78ffd3d5b606de092f05a9743367a
parent4d5486f3784bafadb552ff5fb91b9a02a1df4049 (diff)
downloadATCD-61da23efa77c07b3acb496c2d2d70f7b01d6267f.tar.gz
ChangeLogTag: Thu Jun 28 11:04:49 2001 Jeff Parsons <parsons@cs.wustl.edu>
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 43b26f903ef..456bf91ac84 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -316,8 +316,11 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
CORBA::TypeCode_var tc = value->type (ACE_TRY_ENV);
ACE_CHECK;
- CORBA::Boolean equivalent = this->type_->equivalent (tc.in (),
- ACE_TRY_ENV);
+ CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_TRY_ENV);
+ ACE_CHECK;
+
+ CORBA::Boolean equivalent = disc_tc->equivalent (tc.in (),
+ ACE_TRY_ENV);
ACE_CHECK;
if (!equivalent)