summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp7
-rw-r--r--cpp/src/IceStorm/SubscriberPool.cpp6
2 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 3162116566a..afbd0309a2d 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -813,7 +813,12 @@ Subscriber::flushTime(const IceUtil::Time& interval)
{
if(_resetMax || interval > _maxSend)
{
- assert(interval != IceUtil::Time());
+ //
+ // If is possible for the flush interval to be zero if the
+ // timer resolution is sufficiently big. See
+ // http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1739
+ //
+ //assert(interval != IceUtil::Time());
_resetMax = false;
_maxSend = interval;
}
diff --git a/cpp/src/IceStorm/SubscriberPool.cpp b/cpp/src/IceStorm/SubscriberPool.cpp
index 1d1fd773028..710d0d21581 100644
--- a/cpp/src/IceStorm/SubscriberPool.cpp
+++ b/cpp/src/IceStorm/SubscriberPool.cpp
@@ -52,9 +52,9 @@ public:
}
//
- // If SubscriberPool returns true then the subscriber
- // needs to be SubscriberPooled again, so therefore we
- // will re-enqueue the subscriber in the call to dequeue.
+ // If flush returns true then the subscriber needs to be
+ // flushed again, so therefore we will re-enqueue the
+ // subscriber in the call to dequeue.
//
if(computeInterval)
{