summaryrefslogtreecommitdiff
path: root/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/CIDLC/ServantSourceGenerator.cpp')
-rw-r--r--TAO/CIAO/CIDLC/ServantSourceGenerator.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 4eddfb71fa1..051b61aa356 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -2259,10 +2259,7 @@ namespace
<< "this->context_" << endl
<< STRS[ENV_ARG] << ");"
<< "ACE_TRY_CHECK;"
- << "}" << endl
- << "this->populate_port_tables (" << STRS[ENV_SNGL_ARG]
- << ");"
- << "ACE_TRY_CHECK;"
+ << "}"
<< "}"
<< "ACE_CATCHANY" << endl
<< "{"
@@ -2971,7 +2968,12 @@ namespace
<< "if (! ::CORBA::is_nil (temp.in ()))" << endl
<< "{"
<< "temp->ciao_postactivate (" << STRS[ENV_SNGL_ARG] << ");"
+// << "ACE_CHECK;"
<< "}" << endl
+// @@@ JP - This is commented out for now until other issues in
+// DaNCe get resolved
+// << "this->populate_port_tables (" << STRS[ENV_SNGL_ARG]
+// << ");"
<< "}" << endl;
os << "void" << endl