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/EvictorI.h | |
| 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/EvictorI.h')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index 8995b76da29..ec2792fe541 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -342,6 +342,15 @@ checkIdentity(const Ice::Identity& ident) } } +inline void +checkServant(const Ice::ObjectPtr& servant) +{ + if(servant == 0) + { + throw Ice::IllegalServantException(__FILE__, __LINE__, "cannot add null servant to Freeze Evictor"); + } +} + } #endif |