summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-07-25 17:25:58 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-07-25 17:25:58 +0000
commit95779a66eb32286140dec13a1641f5723d322168 (patch)
treedd86f141a0460bfa7746bc563cde037eedd7cd84 /cpp/src/IceGrid/ServerI.cpp
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1189 (diff)
downloadice-95779a66eb32286140dec13a1641f5723d322168.tar.bz2
ice-95779a66eb32286140dec13a1641f5723d322168.tar.xz
ice-95779a66eb32286140dec13a1641f5723d322168.zip
More replication work.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index a313e1f9388..2c0ea9ce4ff 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -742,8 +742,11 @@ ServerI::setEnabled(bool enabled, const ::Ice::Current&)
}
catch(const Ice::LocalException& ex)
{
- Ice::Warning out(_node->getTraceLevels()->logger);
- out << "unexpected observer exception:\n" << ex;
+ //
+ // Expected if the master IceGrid registry is down.
+ //
+ //Ice::Warning out(_node->getTraceLevels()->logger);
+ //out << "unexpected observer exception:\n" << ex;
}
}
}
@@ -2168,8 +2171,11 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason)
}
catch(const Ice::LocalException& ex)
{
- Ice::Warning out(_node->getTraceLevels()->logger);
- out << "unexpected observer exception:\n" << ex;
+ //
+ // Expected if the master IceGrid registry is down.
+ //
+ //Ice::Warning out(_node->getTraceLevels()->logger);
+ //out << "unexpected observer exception:\n" << ex;
}
}
}