[Erp5-report] r27980 - in /erp5/trunk/products/ERP5Type: Core/ Tool/

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Jul  7 11:06:12 2009
New Revision: 27980

URL: http://svn.erp5.org?rev=27980&view=rev
Log:
Move hooks from MemcachedTool to MemcachePlugin to reset memcached_dict_pool at right time

Modified:
    erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py
    erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py

Modified: erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py?rev=27980&r1=27979&r2=27980&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py [utf8] Tue Jul  7 11:06:12 2009
@@ -34,6 +34,7 @@
 from Products.ERP5.PropertySheet.Url import Url
 from Products.ERP5Type.PropertySheet.MemcachedPlugin import MemcachedPlugin
 from Products.ERP5Type import Permissions
+from Products.ERP5Type.Tool.MemcachedTool import memcached_dict_pool
 
 class MemcachedPlugin(XMLObject):
   """Memcached Plugin authorise Memcached Tool to connect several backends.
@@ -60,3 +61,17 @@
                     , SortIndex
                     , Url
                     )
+
+  def manage_beforeDelete(self, *args, **kw):
+    try:
+      del(memcached_dict_pool.memcached_dict)
+    except AttributeError:
+      pass
+    XMLObject.manage_beforeDelete(self, *args, **kw)
+
+  def manage_afterAdd(self, *args, **kw):
+    try:
+      del(memcached_dict_pool.memcached_dict)
+    except AttributeError:
+      pass
+    XMLObject.manage_afterAdd(self, *args, **kw)

Modified: erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py?rev=27980&r1=27979&r2=27980&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] Tue Jul  7 11:06:12 2009
@@ -303,19 +303,6 @@
       """
       return SharedDict(self._getMemcachedDict(plugin_path), prefix=key_prefix)
 
-    def manage_beforeDelete(self, *args, **kw):
-      try:
-        del(memcached_dict_pool.memcached_dict)
-      except AttributeError:
-        pass
-      BaseTool.manage_beforeDelete(self, *args, **kw)
-
-    def manage_afterAdd(self, *args, **kw):
-      try:
-        del(memcached_dict_pool.memcached_dict)
-      except AttributeError:
-        pass
-      BaseTool.manage_afterAdd(self, *args, **kw)
 else:
   # Placeholder memcache tool
   class MemcachedTool(BaseTool):