diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionManager.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ReplicaCache.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ReplicaSessionManager.cpp | 10 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridnode.dsp | 20 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridregistry.dsp | 24 |
5 files changed, 61 insertions, 16 deletions
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index 5def24820d6..4e6381c38c9 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -62,7 +62,7 @@ NodeSessionKeepAliveThread::run() { session->destroy(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: XXX: TRACE? @@ -125,14 +125,14 @@ NodeSessionKeepAliveThread::keepAlive(const NodeSessionPrx& session) { _node->getTraceLevels()->logger->error("a node with the same name is already registered and active"); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: FIX THIS SHOULD BE A TRACE // - ostringstream os; - os << "couldn't contact the IceGrid registry:\n" << ex; - _node->getTraceLevels()->logger->warning(os.str()); +// ostringstream os; +// os << "couldn't contact the IceGrid registry:\n" << ex; +// _node->getTraceLevels()->logger->warning(os.str()); } } @@ -180,11 +180,12 @@ void NodeSessionManager::destroy() { Lock sync(*this); - for(NodeSessionMap::const_iterator p = _sessions.begin(); p != _sessions.end(); ++p) + NodeSessionMap::const_iterator p; + for(p = _sessions.begin(); p != _sessions.end(); ++p) { p->second->terminate(); } - for(NodeSessionMap::const_iterator p = _sessions.begin(); p != _sessions.end(); ++p) + for(p = _sessions.begin(); p != _sessions.end(); ++p) { p->second->getThreadControl().join(); } diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp index 5a9703eed24..91c5652ae11 100644 --- a/cpp/src/IceGrid/ReplicaCache.cpp +++ b/cpp/src/IceGrid/ReplicaCache.cpp @@ -88,7 +88,7 @@ ReplicaCache::add(const string& name, const ReplicaSessionIPtr& session, const D { _nodes->replicaAdded(session->getProxy()); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // TODO: XXX } @@ -106,7 +106,7 @@ ReplicaCache::remove(const string& name, const DatabasePtr& database) { _nodes->replicaRemoved(entry->getSession()->getProxy()); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // TODO: XXX } @@ -141,7 +141,7 @@ ReplicaCache::nodeAdded(const NodePrx& node) { _topic->subscribe(qos, node); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // TODO: XXX } @@ -158,7 +158,7 @@ ReplicaCache::nodeRemoved(const NodePrx& node) { // The replica is being shutdown. } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // TODO: XXX } diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp index ec55bd2c6b6..486cba6f700 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.cpp +++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp @@ -144,7 +144,7 @@ ReplicaSessionKeepAliveThread::run() { session->destroy(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: XXX: TRACE? @@ -207,14 +207,14 @@ ReplicaSessionKeepAliveThread::keepAlive(const ReplicaSessionPrx& session) { _database->getTraceLevels()->logger->error("a replica with the same name is already registered and active"); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: FIX THIS SHOULD BE A TRACE // - ostringstream os; - os << "couldn't contact the IceGrid registry:\n" << ex; - _database->getTraceLevels()->logger->warning(os.str()); +// ostringstream os; +// os << "couldn't contact the IceGrid registry:\n" << ex; +// _database->getTraceLevels()->logger->warning(os.str()); } } diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp index beaf8ea6875..a9f6cd5d008 100755 --- a/cpp/src/IceGrid/icegridnode.dsp +++ b/cpp/src/IceGrid/icegridnode.dsp @@ -182,6 +182,10 @@ SOURCE=.\NodeSessionI.cpp # End Source File
# Begin Source File
+SOURCE=.\NodeSessionManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\ObjectCache.cpp
# End Source File
# Begin Source File
@@ -202,6 +206,18 @@ SOURCE=.\RegistryI.cpp # End Source File
# Begin Source File
+SOURCE=.\ReplicaCache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\ServerAdapterI.cpp
# End Source File
# Begin Source File
@@ -306,6 +322,10 @@ SOURCE=.\NodeRegistryI.h # End Source File
# Begin Source File
+SOURCE=.\NodeSessionManager.h
+# End Source File
+# Begin Source File
+
SOURCE=.\ObjectRegistryI.h
# End Source File
# Begin Source File
diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp index c40774abc2b..912aee0796b 100755 --- a/cpp/src/IceGrid/icegridregistry.dsp +++ b/cpp/src/IceGrid/icegridregistry.dsp @@ -191,6 +191,18 @@ SOURCE=.\RegistryI.cpp # End Source File
# Begin Source File
+SOURCE=.\ReplicaCache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\ServerCache.cpp
# End Source File
# Begin Source File
@@ -287,6 +299,18 @@ SOURCE=.\Registry.h # End Source File
# Begin Source File
+SOURCE=.\ReplicaCache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionI.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReplicaSessionManager.h
+# End Source File
+# Begin Source File
+
SOURCE=.\ServerRegistryI.h
# End Source File
# Begin Source File
|