summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/Flusher.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-02-14 04:16:37 +0000
committerMarc Laukien <marc@zeroc.com>2002-02-14 04:16:37 +0000
commit0f6931918a5fe32cd90fb9f599682838f48cb716 (patch)
tree3201933dcf9691bffd803ed0116895dbf5645d8a /cpp/src/IceStorm/Flusher.cpp
parentRemoved file that shouldn't be present until after merging FreezeXML (diff)
downloadice-0f6931918a5fe32cd90fb9f599682838f48cb716.tar.bz2
ice-0f6931918a5fe32cd90fb9f599682838f48cb716.tar.xz
ice-0f6931918a5fe32cd90fb9f599682838f48cb716.zip
fixes, simplifications
Diffstat (limited to 'cpp/src/IceStorm/Flusher.cpp')
-rw-r--r--cpp/src/IceStorm/Flusher.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp
index 60eaf240ee7..913612843c2 100644
--- a/cpp/src/IceStorm/Flusher.cpp
+++ b/cpp/src/IceStorm/Flusher.cpp
@@ -37,20 +37,11 @@ public:
_traceLevels(traceLevels),
_destroy(false)
{
- Ice::PropertiesPtr properties = communicator->getProperties();
- string value;
- value = properties->getProperty("IceStorm.Flush.Timeout");
- if (!value.empty())
+ _flushTime = atoi(communicator->getProperties()->
+ getPropertyWithDefault("IceStorm.Flush.Timeout", "1000").c_str());
+ if (_flushTime < 100)
{
- _flushTime = atoi(value.c_str());
- if (_flushTime < 100)
- {
- _flushTime = 100; // Minimum of 100 ms
- }
- }
- else
- {
- _flushTime = 1000; // Default of 1 second
+ _flushTime = 100; // Minimum of 100 ms
}
}