diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-05-27 08:49:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-05-27 08:49:57 +0000 |
| commit | 7a78d47b5068b0b119dc53c507155d222e40e218 (patch) | |
| tree | 5356624da6725a904d3ed5b77272b60a01b250c3 | |
| parent | c084054a9ca908a6bd882d964dfb33a99c035645 (diff) | |
| download | ATCD-7a78d47b5068b0b119dc53c507155d222e40e218.tar.gz | |
ChangeLogTag: Fri May 27 08:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index e02b1194e52..94bbe00fd34 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -168,15 +168,14 @@ namespace TAO { PortableServer::Servant servant = this->default_servant_.in (); - if (servant != 0) - { - return servant; - } - else + if (servant == 0) { - return this->poa_->find_servant (system_id - ACE_ENV_ARG_PARAMETER); + servant = this->poa_->find_servant (system_id + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); } + + return servant; } PortableServer::Servant |