[CalendarServer-changes] [3123] CalendarServer/trunk/twistedcaldav/log.py

[source_changes at macosforge.org]

Revision: 3123
          http://trac.macosforge.org/projects/calendarserver/changeset/3123
Author:   cdaboo at apple.com
Date:     2008-10-06 16:09:46 -0700 (Mon, 06 Oct 2008)
Log Message:
-----------
Properly handle empty response data.

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

Modified: CalendarServer/trunk/twistedcaldav/log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/log.py	2008-10-06 22:45:05 UTC (rev 3122)
+++ CalendarServer/trunk/twistedcaldav/log.py	2008-10-06 23:09:46 UTC (rev 3123)
@@ -233,7 +233,7 @@
             def _gotData(data):
                 iostr.write(data)
                 
-                request.stream = MemoryStream(data)
+                request.stream = MemoryStream(data if data is not None else "")
                 request.stream.doStartReading = None
             
                 self.emit(level, iostr.getvalue(), **kwargs)
@@ -272,7 +272,7 @@
             def _gotData(data):
                 iostr.write(data)
                 
-                response.stream = MemoryStream(data)
+                response.stream = MemoryStream(data if data is not None else "")
                 response.stream.doStartReading = None
             
                 self.emit(level, iostr.getvalue(), **kwargs)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081006/163ceb1c/attachment.html