[CalendarServer-changes] [3400] CalendarServer/trunk/twistedcaldav/memcacher.py

[source_changes at macosforge.org]

Revision: 3400
          http://trac.macosforge.org/projects/calendarserver/changeset/3400
Author:   wsanchez at apple.com
Date:     2008-11-20 10:33:47 -0800 (Thu, 20 Nov 2008)
Log Message:
-----------
Actually caching to the ivar is a good thing.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/memcacher.py

Modified: CalendarServer/trunk/twistedcaldav/memcacher.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcacher.py	2008-11-19 20:40:39 UTC (rev 3399)
+++ CalendarServer/trunk/twistedcaldav/memcacher.py	2008-11-20 18:33:47 UTC (rev 3400)
@@ -103,23 +103,21 @@
             return self._memcacheProtocol
 
         if config.Memcached['ClientEnabled']:
-            return self.getCachePool()
+            self._memcacheProtocol = self.getCachePool()
 
         elif config.ProcessType == "Single" or self._noInvalidation:
-
             # NB no need to pickle the memory cacher as it handles python types natively
             self._memcacheProtocol = Memcacher.memoryCacher()
             self._pickle = False
-            return self._memcacheProtocol
 
         else:
-
             # NB no need to pickle the null cacher as it handles python types natively
             self._memcacheProtocol = Memcacher.nullCacher()
             self._pickle = False
-            return self._memcacheProtocol
 
+        return self._memcacheProtocol
 
+
     def add(self, key, value, expire_time=0):
         my_value = value
         if self._pickle:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081120/be8eef39/attachment.html>