diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-08-29 15:30:49 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-08-29 15:37:29 -0700 |
| commit | b71c6d0544463b6e61e3371babe4375aa05307c8 (patch) | |
| tree | 14324bd25e64b2afab7458fd93ab8cf8d358dbf7 /cpp/src/slice2java/Gen.cpp | |
| parent | Updated gitignore (diff) | |
| download | ice-b71c6d0544463b6e61e3371babe4375aa05307c8.tar.bz2 ice-b71c6d0544463b6e61e3371babe4375aa05307c8.tar.xz ice-b71c6d0544463b6e61e3371babe4375aa05307c8.zip | |
bug 2424: check for null in Java hashCode method
merging java/CHANGES from 3.2.1
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 016ec040ac8..cb18201042a 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -372,7 +372,10 @@ Slice::JavaVisitor::writeHashCode(Output& out, const TypePtr& type, const string ConstructedPtr constructed = ConstructedPtr::dynamicCast(type); assert(constructed); + out << nl << "if(" << name << " != null)"; + out << sb; out << nl << "__h = 5 * __h + " << name << ".hashCode();"; + out << eb; } void |