svn commit: r1501371 - /subversion/trunk/subversion/libsvn_ra_serf/util_error.c

[danielsh]

Author: danielsh
Date: Tue Jul  9 16:41:22 2013
New Revision: 1501371

URL: http://svn.apache.org/r1501371
Log:
Fix bug in r1501049.

Found by: rhuijben

* subversion/libsvn_ra_serf/util_error.c
  (svn_ra_serf__wrap_err): Wrap ERR later since the incumbent pointer value is
    needed to set its ->message member correctly; it was set to "APR does not
    understand this error code"  at line
    54:  err = svn_error_create(status, NULL, NULL);
    because STATUS was neither a Subversion error code nor an APR one, and is
    being overriden in lines 89:96.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/util_error.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/util_error.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util_error.c?rev=1501371&r1=1501370&r2=1501371&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util_error.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util_error.c Tue Jul  9 16:41:22 
2013
@@ -61,7 +61,6 @@ svn_ra_serf__wrap_err(apr_status_t statu
 
       if (serf_err_msg)
         {
-          err = svn_error_create(SVN_ERR_RA_SERF_WRAPPED_ERROR, err, NULL);
           err_msg = serf_err_msg;
         }
       else
@@ -97,5 +96,9 @@ svn_ra_serf__wrap_err(apr_status_t statu
         }
     }
 
+  /* Make the outer-most error code be a Subversion/APR one. */
+  if (serf_err_msg)
+    err = svn_error_create(SVN_ERR_RA_SERF_WRAPPED_ERROR, err, NULL);
+
   return err;
 }