summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2008-03-31 15:48:04 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2008-03-31 15:48:04 +0000
commit352ed12e0ee8144f5a104201deaeadc5376ea457 (patch)
treebe6d459d9612465ea088296ee35d702c07b2bd2d
parent1d49197e92c9c0a260be35bae65ecb01cd917e29 (diff)
downloadATCD-352ed12e0ee8144f5a104201deaeadc5376ea457.tar.gz
ChangeLogTag: Mon Mar 31 15:46:35 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ACE/ATDChangeLog10
-rw-r--r--ACE/ace/Acceptor.cpp2
-rw-r--r--ACE/ace/Connector.cpp2
-rw-r--r--ACE/ace/Strategies_T.cpp4
4 files changed, 14 insertions, 4 deletions
diff --git a/ACE/ATDChangeLog b/ACE/ATDChangeLog
new file mode 100644
index 00000000000..5ed653971e6
--- /dev/null
+++ b/ACE/ATDChangeLog
@@ -0,0 +1,10 @@
+Mon Mar 31 15:46:35 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
+
+ * ace/Acceptor.cpp:
+ * ace/Connector.cpp:
+ * ace/Strategies_T.cpp:
+
+ When calling close() after a failed open() call, pass one as the
+ flags instead of zero. This gives an indication of the situation
+ and allows for different things to be done in the situation where
+ an open fails.
diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp
index 2dd5b52d926..7561f33f3eb 100644
--- a/ACE/ace/Acceptor.cpp
+++ b/ACE/ace/Acceptor.cpp
@@ -294,7 +294,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
ACE_Errno_Guard error(errno);
// Close down handler to avoid memory leaks.
- svc_handler->close (0);
+ svc_handler->close (1);
return -1;
}
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index 112fbca4003..514b7c31507 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -233,7 +233,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HAND
{
// Make sure to close down the <svc_handler> to avoid descriptor
// leaks.
- svc_handler->close (0);
+ svc_handler->close (1);
return -1;
}
else
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index aa3b607d52e..af218158e45 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -197,7 +197,7 @@ ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_ha
result = -1;
if (result == -1)
- svc_handler->close (0);
+ svc_handler->close (1);
return result;
}
@@ -252,7 +252,7 @@ ACE_Reactive_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handl
return this->inherited::activate_svc_handler (svc_handler, arg);
if (result == -1)
- svc_handler->close (0);
+ svc_handler->close (1);
return result;
}