summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/NodeI.cpp1
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp6
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;