summaryrefslogtreecommitdiff
path: root/ACE/protocols
diff options
context:
space:
mode:
authorMartin Corino <mcorino@remedy.nl>2015-08-31 08:16:11 +0200
committerMartin Corino <mcorino@remedy.nl>2015-08-31 08:16:11 +0200
commit392bd7909440c44c5b961fecef14f6e92a4f9889 (patch)
tree57dd0c356496dbea8234d110f540318d1f90e84c /ACE/protocols
parent99f34e144b81cd42152df1d1e07d39a37b00c0ab (diff)
downloadATCD-392bd7909440c44c5b961fecef14f6e92a4f9889.tar.gz
Plug another hole. Correct state comparison.
* ACE/protocols/ace/INet/ClientRequestHandler.cpp: * ACE/protocols/ace/INet/ClientRequestHandler.h: Revert unnecessary singleton export. * ACE/protocols/ace/INet/ConnectionCache.cpp:
Diffstat (limited to 'ACE/protocols')
-rw-r--r--ACE/protocols/ace/INet/ClientRequestHandler.cpp2
-rw-r--r--ACE/protocols/ace/INet/ClientRequestHandler.h2
-rw-r--r--ACE/protocols/ace/INet/ConnectionCache.cpp2
3 files changed, 1 insertions, 5 deletions
diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.cpp b/ACE/protocols/ace/INet/ClientRequestHandler.cpp
index 4eaa2c0c0a7..c0ef1f794b6 100644
--- a/ACE/protocols/ace/INet/ClientRequestHandler.cpp
+++ b/ACE/protocols/ace/INet/ClientRequestHandler.cpp
@@ -67,6 +67,4 @@ namespace ACE
}
}
-ACE_SINGLETON_TEMPLATE_INSTANTIATE (ACE_Singleton, ACE::INet::ConnectionCache, ACE_SYNCH_MUTEX);
-
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.h b/ACE/protocols/ace/INet/ClientRequestHandler.h
index 825b771766b..660eeeaddee 100644
--- a/ACE/protocols/ace/INet/ClientRequestHandler.h
+++ b/ACE/protocols/ace/INet/ClientRequestHandler.h
@@ -100,8 +100,6 @@ namespace ACE
}
}
-ACE_INET_SINGLETON_DECLARE (ACE_Singleton, ACE::INet::ConnectionCache, ACE_SYNCH_MUTEX);
-
ACE_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp
index bad80f80a07..8de43f7f9ac 100644
--- a/ACE/protocols/ace/INet/ConnectionCache.cpp
+++ b/ACE/protocols/ace/INet/ConnectionCache.cpp
@@ -351,7 +351,7 @@ namespace ACE
iter != this->cache_map_.end ();
++iter)
{
- if ((*iter).int_id_.state () == ConnectionCacheValue::CST_CLOSED)
+ if ((*iter).int_id_.state () != ConnectionCacheValue::CST_CLOSED)
{
connection_type* conn = (*iter).int_id_.connection ();
(*iter).int_id_.connection (0);