summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2015-11-20 13:06:56 -0500
committerBernard Normier <bernard@zeroc.com>2015-11-20 13:06:56 -0500
commitf4357fa23e7c5980c9b6b85054a4e5d5ed66c7a1 (patch)
tree0ebbbb605c637539f49076183cfbc5420f159c77 /cpp/src/Ice/ObjectAdapterI.cpp
parentAdd missing LMDB dependencies (diff)
downloadice-f4357fa23e7c5980c9b6b85054a4e5d5ed66c7a1.tar.bz2
ice-f4357fa23e7c5980c9b6b85054a4e5d5ed66c7a1.tar.xz
ice-f4357fa23e7c5980c9b6b85054a4e5d5ed66c7a1.zip
Reworked IceStorm and IceGrid database error handling
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index d1bc241ee17..220811dda07 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1276,20 +1276,6 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
ex.id = _id;
throw ex;
}
- catch(const InvalidAdapterException& ex)
- {
- if(_instance->traceLevels()->location >= 1)
- {
- Trace out(_instance->initializationData().logger, _instance->traceLevels()->locationCat);
- out << "couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n";
- out << ex.reason;
- }
-
- NotRegisteredException ex1(__FILE__, __LINE__);
- ex1.kindOfObject = "object adapter";
- ex1.id = _id;
- throw ex1;
- }
catch(const InvalidReplicaGroupIdException&)
{
if(_instance->traceLevels()->location >= 1)