diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-13 11:42:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-13 11:42:36 +0000 |
| commit | 189306130cc6c7cbd41a63bbbb7244ac7b06d30c (patch) | |
| tree | 175f002e307bc07fb1a2b55ca1d059a775f37b90 | |
| parent | 557ecef9b6d4912c30f6f77857476aabceb04ea8 (diff) | |
| download | ATCD-189306130cc6c7cbd41a63bbbb7244ac7b06d30c.tar.gz | |
ChangeLogTag: Fri Jan 13 11:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/Valuetype/ValueBase.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index aaa0e94efc4..a217a75cec5 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -175,7 +175,6 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm, // new_object->_tao_unmarshal_v () // new_object->_tao_unmarshal_post () -// CORBA::ValueBase *base = 0; CORBA::ValueFactory_var factory; CORBA::Boolean retval = CORBA::ValueBase::_tao_unmarshal_pre (strm, @@ -346,12 +345,17 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, orb_core->orb ()->lookup_value_factory (repo_id_stream.in ()); } - if (factory == 0) // %! except.! + if (factory == 0) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%N:%l) ERROR: OBV factory is null for <%s>!\n"), - repo_id)); - return false; + if (TAO_debug_level > 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%N:%l) ERROR: OBV factory is null for <%s>!\n"), + repo_id)); + } + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 1, + CORBA::COMPLETED_MAYBE), + false); } return retval; |