diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-09-08 10:46:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-09-08 10:46:19 +0000 |
| commit | 5806e28cb7894c770b8c6926d4cfab2eb967f025 (patch) | |
| tree | fe8b113d24cd563b14f76aa39054ceb583188d55 | |
| parent | 90c8b5e0e38e47694d220c019730d253db474cfe (diff) | |
| download | ATCD-5806e28cb7894c770b8c6926d4cfab2eb967f025.tar.gz | |
Tue Sep 8 10:46:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
set the correct header length for the next fragment. This
fixes bugzilla 3275, thanks to Simon Massey for pointing this out
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e6943206e6d..83803cfbe08 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Sep 8 10:46:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: + set the correct header length for the next fragment. This + fixes bugzilla 3275, thanks to Simon Massey for pointing this out + Mon Sep 7 21:31:28 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * utils/logWalker/Invocation.h: @@ -6,7 +12,7 @@ Mon Sep 7 21:31:28 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> More clean up of debug messages, improve the detection of entry and exit from request waits. - + Mon Sep 7 06:05:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/IFR_Service/IFR_Service.mpc: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index d56f71c9083..0668f01185b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -184,7 +184,7 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::send (iovec *iov, int iovcnt, current_fragment->iovcnt == ACE_IOV_MAX) { // Make a new fragment. - num_fragments++; + ++num_fragments; // Check if too many fragments if (num_fragments > MIOP_MAX_FRAGMENTS) @@ -213,9 +213,9 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::send (iovec *iov, int iovcnt, } // Otherwise, initialize another fragment. - current_fragment++; + ++current_fragment; current_fragment->iovcnt = 1; // The MIOP Header - current_fragment->length = MIOP_HEADER_SIZE; + current_fragment->length = 0; } } |