summaryrefslogtreecommitdiff
path: root/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
committerBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
commit7f767642e79e2775a958781011f13e3d1710c7bd (patch)
treefdb3eb1f826305d0bf3dd659d70c3930001f80c0 /cpp/src/Freeze/BackgroundSaveEvictorI.cpp
parentICE-5573 - .NET TimeoutException ignores Dispatcher (diff)
downloadice-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/BackgroundSaveEvictorI.cpp')
-rw-r--r--cpp/src/Freeze/BackgroundSaveEvictorI.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
index 52c3a64969f..1da527561e3 100644
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
+++ b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
@@ -233,6 +233,7 @@ Ice::ObjectPrx
Freeze::BackgroundSaveEvictorI::addFacet(const ObjectPtr& servant, const Identity& ident, const string& facet)
{
checkIdentity(ident);
+ checkServant(servant);
DeactivateController::Guard deactivateGuard(_deactivateController);
ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, _createDb);