summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-08-30 07:44:08 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-08-30 07:44:08 +0000
commitff16a0e3f4ee57e67971d32bbd28715b14c05f2c (patch)
tree49bad85f60f67e098761a446bd12b2504a39a37d
parente44657c0ef2f123539256478da7122167ae45184 (diff)
downloadATCD-ff16a0e3f4ee57e67971d32bbd28715b14c05f2c.tar.gz
Mon Aug 30 07:44:17 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Connection_Handler.cpp: Readded some code that I zapped by accidennt, this fixes the crashing of the Faults test
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/Connection_Handler.cpp4
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0454da55f30..34e676917e7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,13 @@
+Mon Aug 30 07:44:17 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Connection_Handler.cpp:
+ Readded some code that I zapped by accidennt, this fixes the crashing
+ of the Faults test
+
Fri Aug 27 19:09:02 UTC 2010 Brian Johnson <johnsonb@ociweb.com>
* MPC/config/taobaseidldefaults.mpb:
-
+
Merged dependent_libs change from TAO 1.5a to cause idl files
to be rebuilt when tao_idl's dynamically linked libraries are
rebuilt.
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 8c3dbb314cb..e1c2e368726 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -294,6 +294,8 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
return 1;
}
+ this->is_closed_ = true;
+
// Save the ID for debugging messages
ACE_HANDLE const handle = eh->get_handle ();
@@ -433,6 +435,8 @@ TAO_Connection_Handler::close_handler (u_long)
return 0;
}
+ this->is_closed_ = true;
+
this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
this->orb_core_->leader_follower ());