diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-25 04:17:49 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-25 04:17:49 +0000 |
| commit | a6a54be2b285dc10d447ccd9976de76a523a9b45 (patch) | |
| tree | c55cd28dcadf1e442033cebaf78677b69157a630 | |
| parent | f66f8c1a58106311116f41ccb6f8712f2f4930a7 (diff) | |
| download | ATCD-a6a54be2b285dc10d447ccd9976de76a523a9b45.tar.gz | |
ChangeLogTag:Tue May 24 21:13:46 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 457f9861d8d..cd009c1ac94 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue May 24 21:13:46 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Invocation_Adapter.cpp (invoke_collocated_i): + + Updated ACE_ASSERT condition to reflect new thru POA case. + Thanks to Lothar Werzinger for reporting the assertion. + Tue May 24 19:57:43 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/Event_Service/Makefile.am: diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 5b6a003b07c..5220db65940 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -160,7 +160,9 @@ namespace TAO { // To make a collocated call we must have a collocated proxy broker, the // invoke_i() will make sure that we only come here when we have one - ACE_ASSERT (cpb_ != 0); + ACE_ASSERT (cpb_ != 0 + || (strat == TAO_CS_THRU_POA_STRATEGY + && effective_target->_servant () != 0)); // Initial state TAO::Invocation_Status status = TAO_INVOKE_START; |