summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-05-14 16:07:42 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-05-14 16:07:42 +0000
commite9e393ef9c60f6ba41817be1cf89c1bcb5deec46 (patch)
tree404fdaac9e54ab70c2cc1069aa6acdc64f0f607f
parent490e4835caf6ac8bf59c219c732ec487f81a8273 (diff)
downloadATCD-e9e393ef9c60f6ba41817be1cf89c1bcb5deec46.tar.gz
ChangeLogTag: Mon May 14 11:02:20 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-02a8
-rw-r--r--ChangeLogs/ChangeLog-03a8
-rw-r--r--ace/Strategies_T.i7
4 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c8ba81b191..da02661dca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon May 14 11:02:20 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Strategies_T.i: Removed the ACE_ERROR statement from the
+ destructor of ACE_Accept_Strategy. This created problems when
+ the destructor was called during shutdown if the object was
+ statically allocated. Thanks to Jonathan Reis <reis@stentor.com>
+ for reporting this problem.
+
Mon May 14 07:48:16 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* ace/Proces_Mutex.{h,cpp,inl}: Reverted the change "Thu May 10
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 9c8ba81b191..da02661dca3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Mon May 14 11:02:20 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Strategies_T.i: Removed the ACE_ERROR statement from the
+ destructor of ACE_Accept_Strategy. This created problems when
+ the destructor was called during shutdown if the object was
+ statically allocated. Thanks to Jonathan Reis <reis@stentor.com>
+ for reporting this problem.
+
Mon May 14 07:48:16 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* ace/Proces_Mutex.{h,cpp,inl}: Reverted the change "Thu May 10
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9c8ba81b191..da02661dca3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Mon May 14 11:02:20 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * ace/Strategies_T.i: Removed the ACE_ERROR statement from the
+ destructor of ACE_Accept_Strategy. This created problems when
+ the destructor was called during shutdown if the object was
+ statically allocated. Thanks to Jonathan Reis <reis@stentor.com>
+ for reporting this problem.
+
Mon May 14 07:48:16 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* ace/Proces_Mutex.{h,cpp,inl}: Reverted the change "Thu May 10
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i
index 98620bab345..6c87fe984ec 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.i
@@ -104,7 +104,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[],
svc_name,
svc_rep,
thr_mgr) == -1)
- ACE_ERROR ((LM_ERROR,
+ ACE_ERROR ((LM_ERROR,
ACE_LIB_TEXT ("%p\n"),
ACE_LIB_TEXT ("open")));
}
@@ -224,8 +224,9 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (voi
{
ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy");
- if (this->acceptor_.close () == -1)
- ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%P|%t) %p\n"), ACE_LIB_TEXT ("close")));
+ // Close the underlying acceptor.
+ this->acceptor_.close ();
+
}
template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ASYS_INLINE ACE_PEER_CONNECTOR &