summaryrefslogtreecommitdiff
path: root/ace/Service_Repository.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Service_Repository.cpp')
-rw-r--r--ace/Service_Repository.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 43711da3b7d..0db2df28a47 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -209,15 +209,13 @@ ACE_Service_Repository::find_i (const ASYS_TCHAR name[],
if (i < this->current_size_)
{
- if (this->service_vector_[i]->fini_called ())
+ if (srp != 0)
+ *srp = this->service_vector_[i];
+ if ((*srp)->fini_called ())
{
- if (srp != 0)
- *srp = 0;
+ *srp = 0;
return -1;
}
-
- if (srp != 0)
- *srp = this->service_vector_[i];
if (ignore_suspended
&& this->service_vector_[i]->active () == 0)
return -2;