svn commit: r1707255 - /subversion/trunk/subversion/libsvn_ra_serf/multistatus.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Oct  7 11:17:51 2015
New Revision: 1707255

URL: http://svn.apache.org/viewvc?rev=1707255&view=rev
Log:
Following up on r1707164, simplify the handling of errors during parsing
server generated errors a bit more: return whatever we parsed successfully,
combined with the parser error.

After this patch this includes the error from the status line if nothing
was parsed properly.

* subversion/libsvn_ra_serf/multistatus.c
  (svn_ra_serf__handle_server_error): Add whatever we parsed before the
    parsing errors of server generated errors.

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

Modified: subversion/trunk/subversion/libsvn_ra_serf/multistatus.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/multistatus.c?rev=1707255&r1=1707254&r2=1707255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/multistatus.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/multistatus.c Wed Oct  7 11:17:51 2015
@@ -710,10 +710,10 @@ svn_ra_serf__handle_server_error(svn_ra_
     {
       /* Perhaps we already parsed some server generated message. Let's pass
          all information we can get.*/
-      if (err && server_error->items->nelts)
+      if (err)
         err = svn_error_compose_create(
-                err,
-                svn_ra_serf__server_error_create(handler, scratch_pool));
+          svn_ra_serf__server_error_create(handler, scratch_pool),
+          err);
 
       return svn_error_trace(err);
     }