diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-15 13:55:12 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-15 13:55:12 +0000 |
| commit | 90136b2f363a5399c75cf6dfcd61add41f81f10b (patch) | |
| tree | ca375945bb8b69def5b3460dbef804267ee5ce86 | |
| parent | 8e0405a860107c85e2c017667642ba807116d90b (diff) | |
| download | ATCD-90136b2f363a5399c75cf6dfcd61add41f81f10b.tar.gz | |
ChangeLogTag: Mon Jun 15 13:54:01 UTC 2009 Vladimir Zykov <vz@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Leader_Follower_Flushing_Strategy.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b31bc9f7395..209dbed344f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 15 13:54:01 UTC 2009 Vladimir Zykov <vz@prismtech.com> + + * tao/Leader_Follower_Flushing_Strategy.cpp: + + Improved the fix for Bug#3697 even more. + Mon Jun 15 12:45:55 UTC 2009 Vladimir Zykov <vz@prismtech.com> * tao/Leader_Follower_Flushing_Strategy.cpp: diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 1aba72d78bc..3e34fc526c9 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -65,8 +65,8 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( // since transport will return 0 (letting the reactor know // about more pending work) when handling output/timeout as // long as its queue is not empty. - while (orb_core->orb ()->work_pending () && - !transport->queue_is_empty ()) + while (!transport->queue_is_empty () && + orb_core->orb ()->work_pending ()) { orb_core->orb ()->perform_work (); } |