[CalendarServer-changes] [8439] CalendarServer/branches/users/glyph/shared-pool-fixes

[source_changes at macosforge.org]

Revision: 8439
          http://trac.macosforge.org/projects/calendarserver/changeset/8439
Author:   glyph at apple.com
Date:     2011-12-13 13:50:51 -0800 (Tue, 13 Dec 2011)
Log Message:
-----------
fix to make the test pass

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/shared-pool-fixes/twext/enterprise/adbapi2.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/shared-pool-fixes/

Modified: CalendarServer/branches/users/glyph/shared-pool-fixes/twext/enterprise/adbapi2.py
===================================================================
--- CalendarServer/branches/users/glyph/shared-pool-fixes/twext/enterprise/adbapi2.py	2011-12-13 21:50:47 UTC (rev 8438)
+++ CalendarServer/branches/users/glyph/shared-pool-fixes/twext/enterprise/adbapi2.py	2011-12-13 21:50:51 UTC (rev 8439)
@@ -278,11 +278,16 @@
                 raise
         if derived is not None:
             _deriveQueryEnded(self._cursor, derived)
-        if raiseOnZeroRowCount is not None and self._cursor.rowcount == 0:
-            raise raiseOnZeroRowCount()
         if self._cursor.description:
-            return self._cursor.fetchall()
+            # see test_raiseOnZeroRowCountWithUnreliableRowCount
+            rows = self._cursor.fetchall()
+            if not rows:
+                if raiseOnZeroRowCount is not None:
+                    raise raiseOnZeroRowCount()
+            return rows
         else:
+            if raiseOnZeroRowCount is not None and self._cursor.rowcount == 0:
+                raise raiseOnZeroRowCount()
             return None
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111213/dc8f9abb/attachment.html>