### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1043
diff -u -r1.1043 node.module
--- modules/node/node.module	29 Apr 2009 17:48:11 -0000	1.1043
+++ modules/node/node.module	1 May 2009 22:37:26 -0000
@@ -1047,7 +1047,7 @@
   global $user;
 
   if (!isset($node->is_new)) {
-    $node->is_new = empty($node->nid); 
+    $node->is_new = empty($node->nid);
   }
 
   // Apply filters to some default node fields:
@@ -1132,7 +1132,7 @@
 
   // Update the node access table for this node.
   node_access_acquire_grants($node);
-  
+
   // Clear internal properties.
   unset($node->is_new);
 
@@ -2771,14 +2771,11 @@
   $nids = db_query_range("SELECT nid FROM {node} WHERE nid > %d ORDER BY nid ASC", $context['sandbox']['current_node'], 0, $limit)->fetchCol();
   $nodes = node_load_multiple($nids, array(), TRUE);
   foreach ($nodes as $node) {
-    // To preserve database integrity, only acquire grants if the node
-    // loads successfully.
-    if (!empty($node)) {
-      node_access_acquire_grants($node);
-    }
-    $context['sandbox']['progress']++;
-    $context['sandbox']['current_node'] = $node->nid;
+    node_access_acquire_grants($node);
   }
+  $context['sandbox']['progress'] += count($nids);
+  $context['sandbox']['current_node'] = max($nids);
+
 
   // Multistep processing : report progress.
   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {