Wed Feb 11 14:15:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/Leader_Follower.cpp:
          Layout change

        * tao/Leader_Follower.h:
          Updated link to bugzilla

        * tao/Leader_Follower.inl:
          Const change

        * tao/LF_Event_Loop_Thread_Helper.h:
          Doxygen change

        * tao/LF_Strategy_Complete.cpp:
        * tao/Transport.cpp:
          Updated debug message to match others

        * tao/LF_Strategy_Complete.h:
        * tao/LocateRequest_Invocation.cpp:
          Layout change

        * tao/Muxed_TMS.cpp:
          Check the return value of pop

        * tao/Synch_Invocation.cpp:
          Layout changes

11 files changed, 42 insertions, 20 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3b91652b7cd..d5f27d9cdf6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Wed Feb 11 14:15:28 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Leader_Follower.cpp:
+          Layout change
+
+        * tao/Leader_Follower.h:
+          Updated link to bugzilla
+
+        * tao/Leader_Follower.inl:
+          Const change
+
+        * tao/LF_Event_Loop_Thread_Helper.h:
+          Doxygen change
+
+        * tao/LF_Strategy_Complete.cpp:
+        * tao/Transport.cpp:
+          Updated debug message to match others
+
+        * tao/LF_Strategy_Complete.h:
+        * tao/LocateRequest_Invocation.cpp:
+          Layout change
+
+        * tao/Muxed_TMS.cpp:
+          Check the return value of pop
+
+        * tao/Synch_Invocation.cpp:
+          Layout changes
+
 Wed Feb 11 13:40:28 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_3531_Regression/*:
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h
index 3d5dfd95581..ab25fd97815 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h
@@ -41,7 +41,7 @@ public:
   /// Destructor
   ~TAO_LF_Event_Loop_Thread_Helper (void);
 
-  /// Calls <set_event_loop_thread> on the leader/followers object.
+  /// Calls @c set_event_loop_thread on the leader/followers object.
   int event_loop_return (void) const;
 
 private:
@@ -51,8 +51,7 @@ private:
   /// The Leader/Follower Strategy used by this ORB.
   TAO_LF_Strategy &lf_strategy_;
 
-  /// Remembers the status returned while trying to enter the event
-  /// loop.
+  /// Remembers the status returned while trying to enter the event loop.
   int event_loop_return_;
 };
 
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
index 92b29445e18..687067af7c0 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -44,7 +44,7 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset,
 
   if (result == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("TAO (%P|%t) Failed to wake up ")
+                ACE_TEXT ("TAO (%P|%t) - Failed to wake up ")
                 ACE_TEXT ("a follower thread\n")));
 }
 
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index c39e2f91191..f034e4749cd 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -24,9 +24,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
-
-
 /**
  * @brief A concrete TAO_LF_Strategy for ORB configurations that use
  * the Leader/Followers event loop.
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 1a158ad16d8..6f973fc9747 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -86,8 +86,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai
   // Note that we are waiting.
   ++this->event_loop_threads_waiting_;
 
-  while (this->client_thread_is_leader_ &&
-         result != -1)
+  while (this->client_thread_is_leader_ && result != -1)
     {
       if (max_wait_time == 0)
         {
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index 2058e4c2ac9..b817b450e21 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -134,7 +134,7 @@ public:
    * not work with multiple Leader/Followers sets, consult this bug
    * report for more details:
    *
-   * http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=296
+   * http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=296
    *
    */
   //@{
diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl
index 60293532455..f37256b9d52 100644
--- a/TAO/tao/Leader_Follower.inl
+++ b/TAO/tao/Leader_Follower.inl
@@ -74,7 +74,7 @@ TAO_Leader_Follower::set_event_loop_thread (ACE_Time_Value *max_wait_time)
   if (this->client_thread_is_leader_ &&
       tss->client_leader_thread_ == 0)
     {
-      int result =
+      int const result =
         this->wait_for_client_leader_to_complete (max_wait_time);
 
       if (result != 0)
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index f785f4c75a1..14e2bc9cbff 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -70,8 +70,7 @@ namespace TAO
 
       countdown.update ();
 
-      s = this->send_message (cdr, TAO_TWOWAY_REQUEST
-                              , max_wait_time);
+      s = this->send_message (cdr, TAO_TWOWAY_REQUEST, max_wait_time);
     }
 
     if (s != TAO_INVOKE_SUCCESS)
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 81f0ddcbac7..e93c8c14fae 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -286,9 +286,10 @@ TAO_Muxed_TMS::clear_cache_i (void)
     {
       TAO_Reply_Dispatcher *rd = 0;
 
-      ubs.pop (rd);
-
-      rd->connection_closed ();
+      if (ubs.pop (rd) == 0)
+        {
+          rd->connection_closed ();
+        }
     }
 
   return 0;
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 0d967f66277..660fdc27e13 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -98,8 +98,7 @@ namespace TAO
 
         this->marshal_data (cdr);
 
-
-  // Register a reply dispatcher for this invocation. Use the
+        // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
         TAO_Bind_Dispatcher_Guard dispatch_guard (
           this->details_.request_id (),
@@ -121,7 +120,7 @@ namespace TAO
                                 TAO_TWOWAY_REQUEST,
                                 max_wait_time);
 
-  ace_mon.release();
+        ace_mon.release();
 
 #if TAO_HAS_INTERCEPTORS == 1
         // @@NOTE: Too much code repetition.
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index ddd38059357..ecfa26e9042 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -2672,7 +2672,7 @@ bool
 TAO_Transport::post_open (size_t id)
 {
   if (TAO_debug_level > 9)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open ")
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open, ")
                 ACE_TEXT ("tport id changed from %d to %d\n"), this->id_, id));
   this->id_ = id;