summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-05-29 12:48:59 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-05-29 12:48:59 +0000
commit88695b459c9c1790b07d277df5dc77b7a9c672ce (patch)
tree89a0bc2d68ee331752cfbf240e31199e1eca67ae
parentb80a25c0b1c735fb9195317c120040f59fb5954d (diff)
downloadATCD-88695b459c9c1790b07d277df5dc77b7a9c672ce.tar.gz
Fri May 29 12:47:43 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Transport.cpp (schedule_output): Log an error when the reactor is zero
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tao/Transport.cpp16
2 files changed, 18 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6b1c400ed8d..c5c72c243f3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 29 12:47:43 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Transport.cpp (schedule_output):
+ Log an error when the reactor is zero
+
Fri May 29 11:27:43 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/ZIOP/TestCompressor/TAO_TestCompressor.rc:
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 0097d789c8f..cbdef620de3 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -807,7 +807,18 @@ TAO_Transport::schedule_output_i (void)
ACE_Reactor * const reactor = eh->reactor ();
if (reactor == 0)
- return -1;
+ {
+ if (TAO_debug_level > 1)
+ {
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("TAO (%P|%t) - ")
+ ACE_TEXT ("Transport[%d]::schedule_output_i ")
+ ACE_TEXT ("no reactor,")
+ ACE_TEXT ("returning -1\n"),
+ this->id ()));
+ }
+ return -1;
+ }
// Check to see if our event handler is still registered with the
// reactor. It's possible for another thread to have run close_connection()
@@ -821,7 +832,7 @@ TAO_Transport::schedule_output_i (void)
{
if (TAO_debug_level > 3)
{
- ACE_DEBUG ((LM_DEBUG,
+ ACE_ERROR ((LM_ERROR,
ACE_TEXT ("TAO (%P|%t) - ")
ACE_TEXT ("Transport[%d]::schedule_output_i ")
ACE_TEXT ("event handler not found in reactor,")
@@ -2577,7 +2588,6 @@ TAO_Transport::notify_reactor (void)
this->id ()));
}
-
// Send a notification to the reactor...
int const retval = reactor->notify (eh, ACE_Event_Handler::READ_MASK);