diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-06-03 20:36:23 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-06-03 20:36:23 +0000 |
| commit | 99951dd3fff2861d0d7462d041a2d0a36dba6e74 (patch) | |
| tree | cc95ff1757459d32f6e01d9e1c6fac115c2136f2 /cpp/src/Slice/JavaUtil.cpp | |
| parent | Removed obsolete reference to signalShutdown(). (diff) | |
| download | ice-99951dd3fff2861d0d7462d041a2d0a36dba6e74.tar.bz2 ice-99951dd3fff2861d0d7462d041a2d0a36dba6e74.tar.xz ice-99951dd3fff2861d0d7462d041a2d0a36dba6e74.zip | |
generated code for custom sequences did not check for null
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index f5a4b92b924..bc7b3042379 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -996,6 +996,12 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, string typeS = getAbsolute(seq->scoped(), scope); if(marshal) { + out << nl << "if(" << v << " == null)"; + out << sb; + out << nl << stream << ".writeSize(0);"; + out << eb; + out << nl << "else"; + out << sb; out << nl << stream << ".writeSize(" << v << ".size());"; ostringstream o; o << "__i" << iter; @@ -1006,7 +1012,8 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, out << sb; out << nl << origContentS << " __elem = (" << origContentS << ")" << it << ".next();"; writeMarshalUnmarshalCode(out, scope, seq->type(), "__elem", true, iter, false); - out << eb; + out << eb; // while + out << eb; // else } else { @@ -1783,6 +1790,13 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out, string typeS = getAbsolute(seq->scoped(), scope); if(marshal) { + out << nl << "if(" << v << " == null)"; + out << sb; + out << nl << stream << ".startWriteSequence(" << name << ", 0);"; + out << nl << stream << ".endWriteSequence();"; + out << eb; + out << nl << "else"; + out << sb; out << nl << stream << ".startWriteSequence(" << name << ", " << v << ".size());"; ostringstream o; o << "__i" << iter; @@ -1793,8 +1807,9 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out, out << sb; out << nl << origContentS << " __elem = (" << origContentS << ")" << it << ".next();"; writeGenericMarshalUnmarshalCode(out, scope, seq->type(), "\"e\"", "__elem", true, iter, false); - out << eb; + out << eb; // while out << nl << stream << ".endWriteSequence();"; + out << eb; // else } else { |