diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 14:57:10 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 14:57:10 +0000 |
| commit | 0106fd200b668474a549ddbb27079f467a6c45b2 (patch) | |
| tree | c03a88be86c6512a0c10a9e082c0c03bd4fcb583 | |
| parent | 0ce3e227e5a9f5717099239bbbef5635142aae6a (diff) | |
| download | ATCD-0106fd200b668474a549ddbb27079f467a6c45b2.tar.gz | |
Wed May 8 14:56:24 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7b5688d0f7d..5e0c110dc36 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed May 8 14:56:24 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Dynamic_TP/DTP_Thread_Pool.cpp: + + Fix typos from hasty commit. + Wed May 8 14:42:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tao/Dynamic_TP/DTP_Thread_Pool.cpp: diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 84ebe53a108..5d273dbd040 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -142,9 +142,9 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) (int)this->threads_.thr_count ())); } - if ((this->manager_.orb_core ().has_shutdown () || this->shutdown_) || + if (this->manager_.orb_core ().has_shutdown () || this->shutdown_ || (this->definition_.max_threads_ > 0 && - (int)this->active_count_ >= this->definition_.max_threads_) + (int)this->active_count_ >= this->definition_.max_threads_)) { return false; } @@ -155,7 +155,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) false); if (this->definition_.max_threads_ == -1 || - (int)this->active_count_ < this->definition_.max_threads_)) + (int)this->active_count_ < this->definition_.max_threads_) { if (TAO_debug_level > 7) TAOLIB_DEBUG ((LM_DEBUG, |