Index: includes/registry.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/registry.inc,v
retrieving revision 1.31
diff -u -p -r1.31 registry.inc
--- includes/registry.inc	6 Jun 2010 00:33:05 -0000	1.31
+++ includes/registry.inc	7 Jun 2010 06:02:27 -0000
@@ -100,7 +100,7 @@ function _registry_update() {
     _registry_check_code(REGISTRY_RESET_LOOKUP_CACHE);
   }
   catch (Exception $e) {
-    $transaction->rollback('registry', $e->getMessage(), array(), WATCHDOG_ERROR);
+   // $transaction->rollback('registry', $e->getMessage(), array(), WATCHDOG_ERROR);
     throw $e;
   }
 
@@ -129,13 +129,17 @@ function registry_get_parsed_files() {
  */
 function _registry_parse_files($files) {
   $parsed_files = array();
+  $filetimes = array();
   foreach ($files as $filename => $file) {
     if (file_exists($filename)) {
-      $filectime = filectime($filename);
-      $filemtime = filemtime($filename);
+      $filetimes[$filename] = array(
+        'filectime' => filectime($filename),
+        'filemtime' => filemtime($filename),
+      );
 
       $modified_file = !isset($file['filectime']) || !isset($file['filemtime'])
-                  || $filectime != $file['filectime'] || $filemtime != $file['filemtime'];
+                  || $filetimes[$filename]['filectime'] != $file['filectime'] 
+                  || $filetimes[$filename]['filemtime'] != $file['filemtime'];
       if ($modified_file) {
         // Delete registry entries for this file, so we can insert the new resources.
         db_delete('registry')
@@ -150,8 +154,8 @@ function _registry_parse_files($files) {
     db_merge('registry_file')
       ->key(array('filename' => $filename))
       ->fields(array(
-        'filectime' => $filectime,
-        'filemtime' => $filemtime,
+        'filectime' => $filetimes[$filename]['filectime'],
+        'filemtime' => $filetimes[$filename]['filemtime'],
       ))
       ->execute();
   }