diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/Ice/GC.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceBox/admin/AllTests.cpp | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index cd32101f980..b4f2753802f 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -2887,9 +2887,17 @@ IceInternal::BasicStream::EncapsDecoder::skipSlice() } else { - throw MarshalException(__FILE__, - __LINE__, - "compact format prevents slicing (the sender should use the sliced format instead)"); + if(_sliceType == ObjectSlice) + { + throw NoObjectFactoryException( + __FILE__, __LINE__, + "compact format prevents slicing (the sender should use the sliced format instead)", + _typeId); + } + else + { + throw UnknownUserException(__FILE__, __LINE__, _typeId.substr(2)); + } } if(_encaps->encoding != Encoding_1_0) diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp index daf08851e72..7d747cf9ae0 100644 --- a/cpp/src/Ice/GC.cpp +++ b/cpp/src/Ice/GC.cpp @@ -391,7 +391,6 @@ IceInternal::GC::updateObserver(const CommunicatorObserverPtr& observer) Monitor<Mutex>::Lock sync(*this); if(!observer) { - assert(!_communicatorObserver); // Communicator is destroyed. return; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 7a93d08ebb4..6ba84c8e6b4 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -778,7 +778,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) emitUpcall(base, "(__file, __line)", true); if(p->hasDefaultValues()) { - C << nl << ", "; + C << ", "; writeDataMemberInitializers(C, dataMembers, _useWstring); } C.dec(); diff --git a/cpp/test/IceBox/admin/AllTests.cpp b/cpp/test/IceBox/admin/AllTests.cpp index b446da4796c..b9b1d1e9b50 100644 --- a/cpp/test/IceBox/admin/AllTests.cpp +++ b/cpp/test/IceBox/admin/AllTests.cpp @@ -100,6 +100,7 @@ allTests(const Ice::CommunicatorPtr& communicator) setProps["IceMX.Metrics.All.GroupBy"] = "none"; setProps["IceMX.Metrics.Parent.GroupBy"] = "parent"; pa->setProperties(setProps); + pa->setProperties(Ice::PropertyDict()); views = ma->getMetricsViewNames(); test(views.size() == 3); |