diff options
| -rw-r--r-- | TAO/tao/DynamicAny/DynArray_i.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynSequence_i.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynStruct_i.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynUnion_i.cpp | 5 |
4 files changed, 13 insertions, 8 deletions
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 9397ae32273..93287f2eb18 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -429,10 +429,12 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV) i < this->da_members_.size (); i++) { - // Each component must have been initialized. + // @@@ (JP) This is a workaround until we implement the default + // intial values defined in CORBA 2.3.1. if (!this->da_members_[i].in ()) { - ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), 0); + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), + 0); } // Recursive step diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 9fe749862d9..e55c4c150c5 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -454,10 +454,11 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV) for (CORBA::ULong i = 0; i < this->da_members_.size (); i++) { - // Each component must have been initialized. + // @@@ (JP) This is a workaround until we implement the default + // intial values defined in CORBA 2.3.1. if (!this->da_members_[i].in ()) { - ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); } diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index 5abc2d19695..b1477fe0ef7 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -409,10 +409,11 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV) i < this->da_members_.size (); i++) { - // Each component must have been initialied. + // @@@ (JP) This is a workaround until we implement the default + // intial values defined in CORBA 2.3.1. if (!this->da_members_[i].in ()) { - ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); } diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index c97ed89778e..6358360e356 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -578,11 +578,12 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) CORBA::SystemException )) { - // Both Dynanys must have been initialied. + // @@@ (JP) This is a workaround until we implement the default + // intial values defined in CORBA 2.3.1. if (this->member_.in () == 0 || this->discriminator_.in () == 0) { - ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); } |