Partial fix for ICE-3393:

 - strealined StreamTraits.h
 - added ability to define custom dictionaries in C++ (with cpp:type:...)
 - added tests for custom dictionaries in test/Ice/custom

Fixed ICE-4867:
 - clear parameter before unmarshaling into dictionary/map in C++
 - added test

1 files changed, 7 insertions, 0 deletions

diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index 431926d64b0..e533b77ceda 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -702,6 +702,13 @@ void
 ObjectReader::__read(BasicStream* is)
 {
     InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure());
+ 
+    if(stream == 0)
+    {
+        Ice::ObjectNotExistException ex(__FILE__, __LINE__);
+        cerr << ex.ice_stackTrace() << endl;
+    }
+    
     assert(stream);
     read(stream);
 }