diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-07-08 21:56:22 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-07-08 21:56:22 +0000 |
| commit | cdaa146e98e116272eb17b4476f3b927b79ce624 (patch) | |
| tree | 93d7eb281f9695fb16bbe19295ab40dcf2aba6bc | |
| parent | 20b6966be51841f258553d832b9d9decca5bb8f9 (diff) | |
| download | ATCD-cdaa146e98e116272eb17b4476f3b927b79ce624.tar.gz | |
ChangeLogTag: Thu Jul 8 16:53:06 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 10 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 10 |
2 files changed, 16 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 diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 22822f46afc..4e821ebd8c1 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Jul 8 16:53:06 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp: + + Moved the call to populate_port_tables() from the + component servant constructor to the end of + the ciao_postactivate() method in the component servant, + but it is commented out for now until related issues + in DaNCe are resolved. + Thu Jul 8 16:46:55 2004 Jaiganesh B <jai@dre.vanderbilt.edu> * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: |