ChangeLogTag: Tue Dec 31 19:33:09 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

4 files changed, 30 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 81075938a35..01d527d2c77 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Tue Dec 31 19:33:09 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tao/Condition.h:
+	* tao/Condition.cpp: Added missing includes for the AIX compiler.
+	  Thanks to Jan Wackley for providing this patch.
+
+	* tao/Leader_Follower.cpp (wait_for_event): Cached the transport
+	  id before waiting as a follower or drive the event loop as
+	  leader, and use the cached id for all the debug statements. The
+	  transport object could dissappear during the process of waiting
+	  for connection establishment or connection completion and calls
+	  on the transport object could crash. Thanks to Duane Binder for
+	  reporting this problem.
+
 Tue Dec 31 14:03:53 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r:
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 862e9e5bab4..1ec9ea7cfbb 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -1,7 +1,7 @@
 #ifndef TAO_CONDITION_CPP
 #define TAO_CONDITION_CPP
 #include "Condition.h"
-
+#include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Condition.inl"
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index c5b7e065636..b27ac808011 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -19,6 +19,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Synch_T.h"
+#include "ace/Global_Macros.h"
 
 class ACE_Time_Value;
 
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index a00b71b3ee5..0f11bad8bb4 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -179,6 +179,10 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
   // Optmize the first iteration [no access to errno]
   int result = 1;
 
+  // For some cases the transport may dissappear like when waiting for
+  // connection to be initiated or closed. So cache the id.
+  int t_id = transport->id ();
+
   {
     // Calls this->set_client_thread () on construction and
     // this->reset_client_thread () on destruction.
@@ -202,7 +206,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                       " (follower), cond <%x>\n",
-                      transport->id (), follower.get ()));
+                      t_id, follower.get ()));
 
         // Bound the follower and the LF_Event, this is important to
         // get a signal when the event terminates
@@ -247,7 +251,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
                       ACE_DEBUG ((LM_DEBUG,
                                   "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, "
                                   " (follower) [no timer, cond failed]\n",
-                                  transport->id ()));
+                                  t_id));
 
                     // @@ Michael: What is our error handling in this case?
                     //             We could be elected as leader and
@@ -266,7 +270,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
                       ACE_DEBUG ((LM_DEBUG,
                                   "TAO (%P|%t) - Leader_Follower[%d]::wait, "
                                   "(follower) [has timer, follower failed]\n",
-                                  transport->id ()));
+                                  t_id ));
 
                     // We have timedout.. So set the state in the
                     // LF_Event about this.. We call the non-locking,
@@ -295,7 +299,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
                             ACE_ERROR ((LM_ERROR,
                                         "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, "
                                         "elect_new_leader failed\n",
-                                        transport->id ()));
+                                        t_id ));
                           }
                       }
 
@@ -317,7 +321,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                       " done (follower), successful %d\n",
-                      transport->id (),
+                      t_id,
                       event->successful ()));
 
         // Now somebody woke us up to become a leader or to handle our
@@ -363,7 +367,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                     " (leader) enter reactor event loop\n",
-                    transport->id ()));
+                    t_id));
 
       // If we got our event, no need to run the event loop any
       // further.
@@ -389,7 +393,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                     " (leader) exit reactor event loop\n",
-                    transport->id ()));
+                    t_id));
     }
   }
   //
@@ -409,14 +413,14 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
     ACE_ERROR_RETURN ((LM_ERROR,
                        "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                        " failed to elect new leader\n",
-                       transport->id()),
+                       t_id),
                       -1);
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
                        " handle_events failed\n",
-                       transport->id()),
+                       t_id),
                       -1);
 
   // Return an error if there was a problem receiving the reply...