summaryrefslogtreecommitdiff
path: root/TAO/tao/IIOP_Connection_Handler.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-25 19:19:27 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-25 19:19:27 +0000
commit83d7ed9edd866300f633597ca2b37750dde36cfd (patch)
tree903a8deac70916640b410b4bd9ff1dee8a83cc7b /TAO/tao/IIOP_Connection_Handler.cpp
parentdb5bcfdeb2a2f493308c9d60c39ae820b8f8e415 (diff)
downloadATCD-83d7ed9edd866300f633597ca2b37750dde36cfd.tar.gz
Thu Jan 25 19:16:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/IIOP_Connection_Handler.cpp')
-rw-r--r--TAO/tao/IIOP_Connection_Handler.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index f9bd455feb6..01f0e6043e3 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -105,26 +105,20 @@ TAO_IIOP_Connection_Handler::open (void*)
protocol_properties.dont_route_ =
this->orb_core ()->orb_params ()->sock_dontroute ();
- TAO_Protocols_Hooks *tph =
- this->orb_core ()->get_protocols_hooks ();
+ TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
- bool const client =
- this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
+ bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
try
{
if (client)
{
- tph->client_protocol_properties_at_orb_level (
- protocol_properties
- );
+ tph->client_protocol_properties_at_orb_level (protocol_properties);
}
else
{
- tph->server_protocol_properties_at_orb_level (
- protocol_properties
- );
+ tph->server_protocol_properties_at_orb_level (protocol_properties);
}
}
catch ( ::CORBA::Exception&)
@@ -135,7 +129,9 @@ TAO_IIOP_Connection_Handler::open (void*)
if (this->set_socket_option (this->peer (),
protocol_properties.send_buffer_size_,
protocol_properties.recv_buffer_size_) == -1)
- return -1;
+ {
+ return -1;
+ }
#if !defined (ACE_LACKS_TCP_NODELAY)
if (this->peer ().set_option (ACE_IPPROTO_TCP,
@@ -231,7 +227,7 @@ TAO_IIOP_Connection_Handler::open (void*)
(void) remote_addr.addr_to_string (remote_as_string,
sizeof(remote_as_string));
- ACE_ERROR ((LM_WARNING,
+ ACE_ERROR ((LM_ERROR,
ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ")
ACE_TEXT("invalid connection from IPv4 mapped IPv6 interface <%s>!\n"),
remote_as_string));