summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-07-24 17:14:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-07-24 17:14:30 +0000
commit1700f67b3ff19d9d11f64c48863f30dfa541a50e (patch)
treee31307832d4e46995e060e0f248624f9323082b6
parentd66cc78bd145d4cc47adb1120227a8a623bfe769 (diff)
downloadATCD-1700f67b3ff19d9d11f64c48863f30dfa541a50e.tar.gz
Tue Jul 24 18:13:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp10
2 files changed, 8 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0fd3ebc77d7..9ab32584f06 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 24 18:13:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+ Fixed compile problems related to my changes earlier today
+
Tue Jul 24 15:55:59 UTC 2007 Vadym Ridosh <vridosh@prismtech.com>
* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 400bd38c4b2..6c733ea1692 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -499,16 +499,13 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::handle_input (TAO_Resume_Handle &rh,
// Set the write pointer in the stack buffer.
message_block.wr_ptr (n);
-
// Make a node of the message block..
TAO_Queued_Data qd (&message_block);
- size_t mesg_length;
+ size_t mesg_length = 0;
// Parse the incoming message for validity. The check needs to be
// performed by the messaging objects.
- if (this->messaging_object ()->parse_next_message (message_block,
- qd,
- mesg_length) == -1)
+ if (this->messaging_object ()->parse_next_message (qd, mesg_length) == -1)
{
if (TAO_debug_level)
{
@@ -616,8 +613,7 @@ int
TAO_UIPMC_Transport<CONNECTION_HANDLER>::messaging_init (CORBA::Octet major,
CORBA::Octet minor)
{
- this->messaging_object_->init (major,
- minor);
+ this->messaging_object_->init (major, minor);
return 1;
}