diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-09-01 16:46:33 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-09-01 16:46:33 -0400 |
| commit | 568f36e3dd57b191e85a51d0cbd4e39dbebd5db0 (patch) | |
| tree | 0d473ec9248b9902ca0dc7c98e741c3ff26188c1 /cpp/src | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-568f36e3dd57b191e85a51d0cbd4e39dbebd5db0.tar.bz2 ice-568f36e3dd57b191e85a51d0cbd4e39dbebd5db0.tar.xz ice-568f36e3dd57b191e85a51d0cbd4e39dbebd5db0.zip | |
Simplified observer proxy
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceStorm/Observers.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp index a752c89ba16..06ea3135481 100644 --- a/cpp/src/IceStorm/Observers.cpp +++ b/cpp/src/IceStorm/Observers.cpp @@ -96,8 +96,7 @@ Observers::init(const set<GroupNodeInfo>& slaves, const LogUpdate& llu, const To { assert(p->observer); - // 60s timeout for reliability in the event that a replica becomes unresponsive. - ReplicaObserverPrx observer = ReplicaObserverPrx::uncheckedCast(p->observer->ice_timeout(60 * 1000)); + ReplicaObserverPrx observer = ReplicaObserverPrx::uncheckedCast(p->observer); Ice::AsyncResultPtr result = observer->begin_init(llu, content); observers.push_back(ObserverInfo(p->id, observer, result)); |