diff options
| author | sharath <sharath@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-06-27 19:16:30 +0000 |
|---|---|---|
| committer | sharath <sharath@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-06-27 19:16:30 +0000 |
| commit | 30aadeef91308f0c1c08307c64a135d7558b8078 (patch) | |
| tree | 508aa7018bcd365ebfae2d414821f025d3b5f636 | |
| parent | ed5c5077dc45bf454c70abfe9cac351ff3745216 (diff) | |
| download | ATCD-30aadeef91308f0c1c08307c64a135d7558b8078.tar.gz | |
ChangeLogTag: Wed Jun 27 14:15:13 2001 Sharath R. Cholleti <sharath@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tao/skip.cpp | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c9be5c8d7a3..dd193ebe0d4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Jun 27 14:15:13 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tao/skip.cpp: + + Changed TAO_Marshall_WString::skip() to use skip_wstring() instead + of skip_wchar(). This has been made necessary according to the + changes made to skip_wchar() for GIOP 1.2 (BUGID 945) + Wed Jun 27 11:24:03 2001 Jeff Parsons <parsons@cs.wustl.edu> * tests/Param_Test/anyop.dsp: @@ -470,7 +478,7 @@ Wed Jun 20 07:48:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Makefile.bor Removed the Endpoint_Per_Priority and added the Big_Reply tests -Tue Jun 19 14:35:43 2001 Jeff Parsons <parsons@cs.wustl.edu> +Tue Jun 19 14:45:43 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> * tao/Strategies/GIOP_Message_NonReactive_Base.cpp: diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 8f97be66cee..c269e74d5cd 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -868,8 +868,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { - CORBA::Boolean continue_skipping = 1; - CORBA::ULong len; + ACE_CDR::Boolean continue_skipping = 1; // On decode, omit the check against specified wstring bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -879,13 +878,9 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, // don't generate messages that fail to comply with protocol specs, // but we will accept them when it's clear how to do so. - continue_skipping = stream->read_ulong (len); + // "zero length" wstrings are legal in GIOP 1.2. - if (len != 0) - while (continue_skipping != 0 && len--) - { - continue_skipping = stream->skip_wchar (); - } + continue_skipping = stream->skip_wstring (); if (continue_skipping == 1) return CORBA::TypeCode::TRAVERSE_CONTINUE; |