summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/BasicStream.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-25 14:42:23 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-25 14:42:23 +0200
commitf848c3f77e1b7e46013c4d24bd0da6c0d28c1fd9 (patch)
tree7fa5a29c0eda49684dd5ef6a7e6f2a5befaa0b55 /cpp/src/Ice/BasicStream.cpp
parentFixed previous fix for adapterDeactivation test warnings (diff)
downloadice-f848c3f77e1b7e46013c4d24bd0da6c0d28c1fd9.tar.bz2
ice-f848c3f77e1b7e46013c4d24bd0da6c0d28c1fd9.tar.xz
ice-f848c3f77e1b7e46013c4d24bd0da6c0d28c1fd9.zip
Fixed ICE-558 - Improved NoObjectFactoryException messages
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r--cpp/src/Ice/BasicStream.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 157d5e0c8ae..2321bf1515e 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -2368,7 +2368,8 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance()
//
if(!_sliceObjects)
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "object slicing is disabled", _typeId);
+ throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
+ _typeId);
}
//
@@ -2667,10 +2668,10 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice()
{
if(_current->sliceType == ObjectSlice)
{
- throw NoObjectFactoryException(
- __FILE__, __LINE__,
- "compact format prevents slicing (the sender should use the sliced format instead)",
- _current->typeId);
+ throw NoObjectFactoryException(__FILE__, __LINE__,
+ "no object factory found and compact format prevents "
+ "slicing (the sender should use the sliced format instead)",
+ _current->typeId);
}
else
{
@@ -2834,7 +2835,8 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat
//
if(!_sliceObjects)
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "object slicing is disabled", _current->typeId);
+ throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
+ _current->typeId);
}
//