diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 31f21a2e4ea..74d2f70cbd2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 3 08:20:50 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/Notify_Service/Notify_Service.cpp: + Only run the orb when we have no orb threads + Tue Jun 2 18:40:50 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_other_tests.lst: diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 6afccf31eda..09d282dc65f 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -348,8 +348,10 @@ TAO_Notify_Service_Driver::run (void) worker_.thr_mgr ()->wait (); return 0; } - - this->orb_->run (); + else + { + this->orb_->run (); + } this->logging_worker_.end(); return 0; |