diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-10-02 17:15:36 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-10-02 17:15:36 +0000 |
| commit | 6b10589bd451d004f946bdfd2b015868cb51e36d (patch) | |
| tree | 676d7ce5112155ef2e418b57ea32148d3aed9294 | |
| parent | 6dcce6e536f98f711c1d529524e662468911da31 (diff) | |
| download | ATCD-6b10589bd451d004f946bdfd2b015868cb51e36d.tar.gz | |
ChangeLogTag: Tue Oct 2 12:13:15 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 40b983bf38b..30be8e3f21b 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Oct 2 12:13:15 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/GIOP_Message_Base.cpp: If the read message is less than the + size of the GIOP message, then we make the missing_data as -1 so + that the message would be automatically queued. This should fix + the Blocking_Sync_None tests hanging once in a while on + guajira.cs builds. + Tue Oct 2 11:05:10 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Transport.cpp: Removed a debug statement that made no diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 6a9fe6fc7b2..d9f52141b98 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -290,10 +290,13 @@ TAO_GIOP_Message_Base::missing_data (ACE_Message_Block &incoming) size_t len = incoming.length (); - if (len > msg_size) + // If we have too many messages or if we have less than even a size + // of the GIOP header then .. + if (len > msg_size || + len < TAO_GIOP_MESSAGE_HEADER_LEN) { return -1; - } + } else if (len == msg_size) return 0; |