diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-07-10 16:51:36 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-07-10 16:51:36 -0400 |
| commit | 7f767642e79e2775a958781011f13e3d1710c7bd (patch) | |
| tree | fdb3eb1f826305d0bf3dd659d70c3930001f80c0 /cpp/src/Freeze/TransactionalEvictorI.cpp | |
| parent | ICE-5573 - .NET TimeoutException ignores Dispatcher (diff) | |
| download | ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.bz2 ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.xz ice-7f767642e79e2775a958781011f13e3d1710c7bd.zip | |
Fixed ICE-5379, Object Adapter should reject null servant, in C++, Java, C# and JS
Diffstat (limited to 'cpp/src/Freeze/TransactionalEvictorI.cpp')
| -rw-r--r-- | cpp/src/Freeze/TransactionalEvictorI.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Freeze/TransactionalEvictorI.cpp b/cpp/src/Freeze/TransactionalEvictorI.cpp index c41531f34ae..46680e0ee0f 100644 --- a/cpp/src/Freeze/TransactionalEvictorI.cpp +++ b/cpp/src/Freeze/TransactionalEvictorI.cpp @@ -137,6 +137,7 @@ ObjectPrx Freeze::TransactionalEvictorI::addFacet(const ObjectPtr& servant, const Identity& ident, const string& facet) { checkIdentity(ident); + checkServant(servant); DeactivateController::Guard deactivateGuard(_deactivateController); ObjectStore<TransactionalEvictorElement>* store = findStore(facet, _createDb); |