[CalendarServer-changes] [4363] CalendarServer/trunk/memcacheclient.py

[source_changes at macosforge.org]

Revision: 4363
          http://trac.macosforge.org/projects/calendarserver/changeset/4363
Author:   cdaboo at apple.com
Date:     2009-06-22 08:33:39 -0700 (Mon, 22 Jun 2009)
Log Message:
-----------
Prevent key errors.

Modified Paths:
--------------
    CalendarServer/trunk/memcacheclient.py

Modified: CalendarServer/trunk/memcacheclient.py
===================================================================
--- CalendarServer/trunk/memcacheclient.py	2009-06-19 23:24:17 UTC (rev 4362)
+++ CalendarServer/trunk/memcacheclient.py	2009-06-22 15:33:39 UTC (rev 4363)
@@ -867,7 +867,10 @@
                     #  Bo Yang reports that this can sometimes be None
                     if rkey is not None:
                         val = self._recv_value(server, flags, rlen)
-                        retvals[prefixed_to_orig_key[rkey]] = val   # un-prefix returned key.
+                        try:
+                            retvals[prefixed_to_orig_key[rkey]] = val   # un-prefix returned key.
+                        except KeyError:
+                            pass
                     line = server.readline()
             except (_Error, socket.error), msg:
                 if type(msg) is types.TupleType: msg = msg[1]
@@ -907,7 +910,10 @@
                     #  Bo Yang reports that this can sometimes be None
                     if rkey is not None:
                         val = self._recv_value(server, flags, rlen)
-                        retvals[prefixed_to_orig_key[rkey]] = (val, cas_token)   # un-prefix returned key.
+                        try:
+                            retvals[prefixed_to_orig_key[rkey]] = (val, cas_token)   # un-prefix returned key.
+                        except KeyError:
+                            pass
                     line = server.readline()
             except (_Error, socket.error), msg:
                 if type(msg) is types.TupleType: msg = msg[1]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090622/fccba16f/attachment.html>