From a4f93259dc3494d98addf38e69b87eb557d432b3 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 27 Jun 2014 10:31:41 +0200 Subject: Better collocation optimization, fix for ICE-5489, ICE-5484 --- cpp/src/IceGrid/Topics.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cpp/src/IceGrid/Topics.cpp') 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])); } } -- cgit v1.2.3