summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Topics.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2006-10-26 03:50:00 +0000
committerMatthew Newhook <matthew@zeroc.com>2006-10-26 03:50:00 +0000
commit12203029a37a8145599d368359710469b29f0318 (patch)
treed95dcc0d7c312f60e6c686a244e00a1436236ba8 /cpp/src/IceGrid/Topics.cpp
parentfix for missing ICE_HOME (diff)
downloadice-12203029a37a8145599d368359710469b29f0318.tar.bz2
ice-12203029a37a8145599d368359710469b29f0318.tar.xz
ice-12203029a37a8145599d368359710469b29f0318.zip
Renamed IceStorm::subscribe to IceStorm::Topic::subscribeAndGetPublisher.
Integrated the upstream ping stuff. Updated CHANGES file.
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
-rw-r--r--cpp/src/IceGrid/Topics.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index b342b2fc27c..6fd7c4fd21b 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -64,7 +64,7 @@ ObserverTopic::subscribe(const Ice::ObjectPrx& obsv, const string& name)
IceStorm::QoS qos;
qos["reliability"] = "twoway ordered";
- initObserver(_topic->subscribe(qos, obsv));
+ initObserver(_topic->subscribeAndGetPublisher(qos, obsv));
_subscribers.insert(obsv->ice_getIdentity());