Handler_Cleanup_Strategy added.

1 files changed, 39 insertions, 15 deletions

diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp
index 4afa343e84a..b1d45ecc116 100644
--- a/ace/Cleanup_Strategies_T.cpp
+++ b/ace/Cleanup_Strategies_T.cpp
@@ -12,32 +12,32 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Cached_Connect_Strategy_T.i"
+#include "ace/Cleanup_Strategies_T.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$")
 
-template <class CONTAINER>
-ACE_Cleanup_Strategy<CONTAINER>::~ACE_Cleanup_Strategy (void)
+template <class KEY, class VALUE, class CONTAINER>
+ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
-template <class CONTAINER> int
-ACE_Default_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
-                                                  KEY *key, 
-                                                  VALUE *value)
+template <class KEY, class VALUE, class CONTAINER> int
+ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
+                                                              VALUE *value)
 {
   return container.unbind (*key);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
-template <class CONTAINER> int
-ACE_Svc_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
-                                              KEY *key, 
-                                              VALUE *value)
+template <class KEY, class VALUE, class CONTAINER> int
+ACE_Svc_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                          KEY *key, 
+                                                          VALUE *value)
 {
   (value->first ())->recycler (0, 0);
 
@@ -50,11 +50,35 @@ ACE_Svc_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container,
 }
 
 /////////////////////////////////////////////////////////////////////////////
+template <class KEY, class VALUE, class CONTAINER> int
+ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
+                                                              VALUE *value)
+{
+  // Remove the item from cache only if the handler isnt in use.
+  if ((*value)->active () == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "handle %d\n",
+                  (*value)->get_handle ()));
+      (*value)->close ();
+
+      ACE_DEBUG ((LM_DEBUG, "LRU: before unbind: current_size %d\n", container.current_size ()));
+   
+      if (container.unbind (*key) == -1)
+        return -1;
 
-template <class CONTAINER> int
-ACE_Null_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
-                                               KEY *key, 
-                                               VALUE *value)
+      ACE_DEBUG ((LM_DEBUG, "LRU:after unbind: current_size %d\n", container.current_size ()));
+    }
+
+  return 0;
+
+}
+
+////////////////////////////////////////////////////////////////////////////
+template <class KEY, class VALUE, class CONTAINER> int
+ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                           KEY *key, 
+                                                           VALUE *value)
 {
   return 0;
 }