diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 18:23:56 -0700 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 18:23:56 -0700 |
| commit | 8f14d3f082649684569d22d39ec7796816c76246 (patch) | |
| tree | 96786529c5594c00a427f3579ed3f894b83c0071 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Linux build fixes (diff) | |
| download | ice-8f14d3f082649684569d22d39ec7796816c76246.tar.bz2 ice-8f14d3f082649684569d22d39ec7796816c76246.tar.xz ice-8f14d3f082649684569d22d39ec7796816c76246.zip | |
Fixed and LMDB_HOME setting and fixed travis build
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 220811dda07..d1bc241ee17 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1276,6 +1276,20 @@ 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) |