diff options
| author | Michi Henning <michi@zeroc.com> | 2009-01-30 07:44:16 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-01-30 07:44:16 +1000 |
| commit | d94192be808ee77ccc9dbcfcd5c9bf8abd14c096 (patch) | |
| tree | f6941c0326196496cc7787dff3ae82c8e98acccd /cpp/src | |
| parent | bug 3687 - allow 64-bit integers in array types (diff) | |
| download | ice-d94192be808ee77ccc9dbcfcd5c9bf8abd14c096.tar.bz2 ice-d94192be808ee77ccc9dbcfcd5c9bf8abd14c096.tar.xz ice-d94192be808ee77ccc9dbcfcd5c9bf8abd14c096.zip | |
Bug 3547. Re-enable call to the patch function for null instances because Ice for Pythong and Ruby rely on it.
For consistency, re-enable that call for Java and C# as well--the performance difference is unnoticeable.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index dbc32ecdd5e..ed67c0ede08 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1747,8 +1747,9 @@ IceInternal::BasicStream::read(PatchFunc patchFunc, void* patchAddr) { if(index == 0) { - // No need to call the patch function--the pointer is default-initialized to null anyway. - // patchFunc(patchAddr, v); // Null Ptr. + // Calling the patch function for null instances is necessary for correct functioning of Ice for + // Python and Ruby. + patchFunc(patchAddr, v); // Null Ptr. return; } |