diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
| commit | cb4d5772e9a7a9228577df83027e45ec7de022ea (patch) | |
| tree | bd6489fe77ed5fba43adff613293d580fda8e0f3 /cpp/include/Ice/BasicStream.h | |
| parent | Fixed src tree build of IceJS (diff) | |
| download | ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.bz2 ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.xz ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.zip | |
Fixed ICE-5607: relaxed Ice.MessageSizeMax
Diffstat (limited to 'cpp/include/Ice/BasicStream.h')
| -rw-r--r-- | cpp/include/Ice/BasicStream.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index 7d5fc49b720..9e23e2d2295 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -47,7 +47,7 @@ public: typedef size_t size_type; typedef void (*PatchFunc)(void*, const Ice::ObjectPtr&); - BasicStream(Instance*, const Ice::EncodingVersion&, bool = false); + BasicStream(Instance*, const Ice::EncodingVersion&); BasicStream(Instance*, const Ice::EncodingVersion&, const Ice::Byte*, const Ice::Byte*); ~BasicStream() { @@ -75,14 +75,6 @@ public: void resize(Container::size_type sz) { - // - // Check memory limit if stream is not unlimited. - // - if(!_unlimited && sz > _messageSizeMax) - { - IceInternal::Ex::throwMemoryLimitException(__FILE__, __LINE__, sz, _messageSizeMax); - } - b.resize(sz); i = b.end(); } @@ -1311,9 +1303,6 @@ private: bool _sliceObjects; - const Container::size_type _messageSizeMax; - bool _unlimited; - const IceUtil::StringConverterPtr _stringConverter; const IceUtil::WstringConverterPtr _wstringConverter; |