summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-07-26 03:47:15 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-07-26 03:47:15 +0000
commit46308651c979b962627185353f53b4b878e695ce (patch)
tree0b857c81f59278687629dcb3355a5504daa68beb
parentc420f71fadfbdeb9ce2adb58924e07d44ddcec37 (diff)
downloadATCD-46308651c979b962627185353f53b4b878e695ce.tar.gz
ChangeLogTag: Wed Jul 25 22:45:10 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a14
-rw-r--r--TAO/tao/Strategies/DIOP_Transport.cpp6
-rw-r--r--TAO/tao/Strategies/SHMIOP_Transport.cpp5
3 files changed, 16 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 123d93661f7..fdafe8e1a0a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Wed Jul 25 22:45:10 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/Strategies/SHMIOP_Transport.cpp:
+ * tao/Strategies/DIOP_Transport.cpp: Fixed a compile error that
+ came up from my previous change.
+
+Wed Jul 25 22:39:32 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/RTCORBA/Server_Protocol/server.cpp:
+ * tests/RTCORBA/Client_Propagated/server.cpp:
+ * tests/RTCORBA/Thread_Pool/server.cpp: Added checks & debugging
+ statments for a null RootPOA. thanks to Johnny Willemsen for
+ pointing this out. Did some minor cosmetic fixes.
+
Wed Jul 25 22:10:21 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/Transport.cpp:
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index eef853367fb..893d91938d9 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -211,12 +211,8 @@ TAO_DIOP_Transport::handle_input_i (TAO_Resume_Handle &rh,
// Extract the data for the node..
this->messaging_object ()->get_message_data (&qd);
- // Resume before starting to process the request..
- rh.resume_handle ();
-
// Process the message
- return this->process_parsed_messages (&qd);
-
+ return this->process_parsed_messages (&qd, rh);
}
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 6284a64ad71..6cd79c5620f 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -180,12 +180,9 @@ TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
this->messaging_object ()->get_message_data (&pqd);
- // Resume the handle before processing the request
- rh.resume_handle ();
-
// Now we have a full message in our buffer. Just go ahead and
// process that
- return this->process_parsed_messages (&pqd);
+ return this->process_parsed_messages (&pqd, rh);
}