diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-22 10:06:45 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-22 10:06:45 +0000 |
| commit | b5925aa767d2ee229d93de03339b76101fc36021 (patch) | |
| tree | 85c9fb8f1449952fc21dbe7a6a0c72fca19dd894 /cpp | |
| parent | Fix (diff) | |
| download | ice-b5925aa767d2ee229d93de03339b76101fc36021.tar.bz2 ice-b5925aa767d2ee229d93de03339b76101fc36021.tar.xz ice-b5925aa767d2ee229d93de03339b76101fc36021.zip | |
Fix
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index bad7723f980..107fcf49b5d 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -273,7 +273,6 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, else { _kmem = -1; - cerr << "no k " << endl; } #else _nproc = 1; diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 1e90dfa3f2c..02c24067173 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -373,11 +373,11 @@ ServerEntry::getLoad(LoadSample sample) const switch(sample) { case LoadSample1: - return load.load1 * factor; + return load.load1 < 0.f ? 1.0f : load.load1 * factor; case LoadSample5: - return load.load5 * factor; + return load.load5 < 0.f ? 1.0f : load.load5 * factor; case LoadSample15: - return load.load15 * factor; + return load.load15 < 0.f ? 1.0f : load.load15 * factor; default: assert(false); return 1.0f; |