summaryrefslogtreecommitdiff
path: root/TAO/tao/ORB_Core.cpp
diff options
context:
space:
mode:
authorvzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-12-21 12:41:09 +0000
committervzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-12-21 12:41:09 +0000
commit8cf1b998f822af2d63526b21d02aa2acd2578af2 (patch)
treec97bea385aa741130f27284bcf8591c3df8e245c /TAO/tao/ORB_Core.cpp
parentb0cbf0b5dd3e18343587af990e63e4d77c83eb6b (diff)
downloadATCD-8cf1b998f822af2d63526b21d02aa2acd2578af2.tar.gz
Mon Dec 21 12:39:29 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com>
* bin/tao_orb_tests.lst: * tao/ORB_Core.cpp: Fixed bug#3790 and marked corresponding test as fixed in lst. Now when object is reinitialized and it's not collocated then it's explicitly marked as remote one.
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
-rw-r--r--TAO/tao/ORB_Core.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 73689794ef0..3ba6bca1a4c 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2085,6 +2085,10 @@ TAO_ORB_Core::initialize_object_i (TAO_Stub *stub, const TAO_MProfile &mprofile)
{
retval = collocated_orb_core.get ()->adapter_registry ().initialize_collocated_object (stub);
}
+ else
+ {
+ stub->is_collocated (false);
+ }
return retval;
}