1 files changed, 31 insertions, 70 deletions

diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index 48cbed6c5ac..48fac8f557c 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,7 +1,10 @@
 // $Id$
 
-
-
+ACE_INLINE CORBA::ULong
+TAO_Transport::tag (void) const
+{
+  return this->tag_;
+}
 
 ACE_INLINE TAO_ORB_Core *
 TAO_Transport::orb_core (void) const
@@ -22,97 +25,55 @@ TAO_Transport::wait_strategy (void) const
   return this->ws_;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_Transport::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE long
-TAO_Transport::buffering_timer_id (void) const
-{
-  return this->buffering_timer_id_;
-}
-
-ACE_INLINE void
-TAO_Transport::buffering_timer_id (long new_value)
-{
-  this->buffering_timer_id_ = new_value;
-}
-
-ACE_INLINE const ACE_Time_Value &
-TAO_Transport::buffering_timeout_value (void) const
+ACE_INLINE int
+TAO_Transport::bidirectional_flag (void) const
 {
-  return this->buffering_timeout_value_;
+  return this->bidirectional_flag_;
 }
 
 ACE_INLINE void
-TAO_Transport::buffering_timeout_value (const ACE_Time_Value &new_value)
+TAO_Transport::bidirectional_flag (int flag)
 {
-  this->buffering_timeout_value_ = new_value;
+  this->bidirectional_flag_ = flag;
 }
 
-ACE_INLINE TAO_Transport_Buffering_Queue &
-TAO_Transport::buffering_queue (void)
+/*ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *
+TAO_Transport::cache_map_entry (void)
 {
-  if (this->buffering_queue_ == 0)
-    {
-      // Infinite high water mark: ACE_UINT32_MAX.
-      this->buffering_queue_ =
-        new TAO_Transport_Buffering_Queue (ACE_UINT32_MAX);
-    }
-
-  return *this->buffering_queue_;
+  return this->cache_map_entry_;
 }
+*/
 
 ACE_INLINE void
-TAO_Transport::dequeue_head (void)
+TAO_Transport::cache_map_entry (
+    TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry)
 {
-  // Remove from the head of the queue.
-  ACE_Message_Block *message_block = 0;
-  int result = this->buffering_queue_->dequeue_head (message_block);
-
-  // @@ What to do here on failures?
-  ACE_ASSERT (result != -1);
-  ACE_UNUSED_ARG (result);
-
-  // Release the memory.
-  message_block->release ();
+  this->cache_map_entry_ = entry;
 }
 
 ACE_INLINE int
-TAO_Transport::bidirectional_flag (void) const
+TAO_Transport::flush_timer_pending (void) const
 {
-  return this->bidirectional_flag_;
+  return this->flush_timer_id_ != -1;
 }
 
 ACE_INLINE void
-TAO_Transport::bidirectional_flag (int flag)
+TAO_Transport::reset_flush_timer (void)
 {
-  this->bidirectional_flag_ = flag;
+  this->flush_timer_id_ = -1;
+  this->current_deadline_ = ACE_Time_Value::zero;
 }
 
-ACE_INLINE void
-TAO_Transport::dequeue_all (void)
+ACE_INLINE int
+TAO_Transport::check_event_handler_i (const char *caller)
 {
-  // Flush all queued messages.
-  if (this->buffering_queue_)
+  // if there's no associated event handler, then we act like a null
+  // transport
+  if (this->event_handler_i () == 0)
     {
-      while (!this->buffering_queue_->is_empty ())
-        this->dequeue_head ();
+      this->report_invalid_event_handler (caller);
+      errno = ENOENT;
+      return -1;
     }
-}
-
-/*ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *
-TAO_Transport::cache_map_entry (void)
-{
-  return this->cache_map_entry_;
-}
-*/
-
-ACE_INLINE void
-TAO_Transport::cache_map_entry (
-    TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry)
-{
-  this->cache_map_entry_ = entry;
+  return 0;
 }