svn commit: r1337740 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[rh...@apache.org]

Author: rhuijben
Date: Sat May 12 23:45:46 2012
New Revision: 1337740

URL: http://svn.apache.org/viewvc?rev=1337740&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (conflict_status_walker): Don't create an unneeded iterpool for every not
    conflicted node reported by the status walker.

Found by: gstein

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1337740&r1=1337739&r2=1337740&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sat May 12 23:45:46 2012
@@ -357,13 +357,14 @@ conflict_status_walker(void *baton,
   svn_wc__db_t *db = cswb->db;
 
   const apr_array_header_t *conflicts;
-  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+  apr_pool_t *iterpool;
   int i;
   svn_boolean_t resolved = FALSE;
 
   if (!status->conflicted)
     return SVN_NO_ERROR;
 
+  iterpool = svn_pool_create(scratch_pool);
 
   SVN_ERR(svn_wc__db_read_conflicts(&conflicts, db, local_abspath,
                                     scratch_pool, iterpool));