diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-05-25 14:20:45 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-05-25 14:20:45 +0200 |
commit | 60a630deeffc0e847dbcabcc0ac6e34bdc9aa068 (patch) | |
tree | 267506bf88b16a268014b0cc67dee1e23a72ebb5 /cpp/src/IceGrid/AdapterCache.h | |
parent | vsaddin bug fixes: (diff) | |
download | ice-60a630deeffc0e847dbcabcc0ac6e34bdc9aa068.tar.bz2 ice-60a630deeffc0e847dbcabcc0ac6e34bdc9aa068.tar.xz ice-60a630deeffc0e847dbcabcc0ac6e34bdc9aa068.zip |
Fixed ICE-4835, round-robin policy bug when nodes are down
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.h')
-rw-r--r-- | cpp/src/IceGrid/AdapterCache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 723a85ebbe4..9a42d62b645 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -91,7 +91,7 @@ private: }; typedef IceUtil::Handle<ServerAdapterEntry> ServerAdapterEntryPtr; -class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Mutex +class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Monitor<IceUtil::Mutex> { public: @@ -117,6 +117,7 @@ private: LoadSample _loadSample; std::vector<ServerAdapterEntryPtr> _replicas; int _lastReplica; + bool _requestInProgress; }; typedef IceUtil::Handle<ReplicaGroupEntry> ReplicaGroupEntryPtr; |