summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 17:58:55 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 17:58:55 +0000
commite37aeeabadb7de2567fd0f23c2fc66636ebc8acf (patch)
tree3980c7c5daf04f286b3b2e8ab13d967b6dc2cb41
parent1e4d29b15a06bb20c48bd59e924fed928819930d (diff)
downloadATCD-e37aeeabadb7de2567fd0f23c2fc66636ebc8acf.tar.gz
ChangeLogTag: Fri Jun 17 17:58:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tao/ORB.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 901c25d181b..327c1183062 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 17 17:58:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/ORB.cpp:
+ Fixed resolve_initial_references of the CodecFactory
+
Fri Jun 17 12:31:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PI_Server/*:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0910712b4cd..6ac3896e62c 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1146,6 +1146,11 @@ CORBA::ORB::resolve_initial_references (const char *name,
}
else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
{
+ result = this->orb_core ()->resolve_typecodefactory (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ }
+ else if (ACE_OS::strcmp (name, TAO_OBJID_CODECFACTORY) == 0)
+ {
result = this->orb_core ()->resolve_codecfactory (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::Object::_nil ());
}