diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/IceGrid/Topics.cpp | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index efdc21492c9..6bdc1a1ee64 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -51,9 +51,8 @@ ObserverTopic::ObserverTopic(const IceStorm::TopicManagerPrx& topicManager, cons // topic because the subscribe() method is given a fixed proxy // which can't be marshalled. // - _topics[encodings[i]] = t->ice_collocationOptimized(true); - _basePublishers.push_back( - t->getPublisher()->ice_collocationOptimized(false)->ice_encodingVersion(encodings[i])); + _topics[encodings[i]] = t; + _basePublishers.push_back(t->getPublisher()->ice_encodingVersion(encodings[i])); } } |