subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1503553 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_ra_serf/commit.c subversion/libsvn_ra_serf/util.c
Date Tue, 16 Jul 2013 04:00:15 GMT
Author: svn-role
Date: Tue Jul 16 04:00:14 2013
New Revision: 1503553

URL: http://svn.apache.org/r1503553
Log:
Merge r1502577 from trunk:

 * r1502577
   Change malfunctions to errors.
   Justification:
     There is no reason to invoke malfunction_handler in those failure modes.
   Votes:
     +1: danielsh, gstein, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c
    subversion/branches/1.8.x/subversion/libsvn_ra_serf/util.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1502577

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1503553&r1=1503552&r2=1503553&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul 16 04:00:14 2013
@@ -202,13 +202,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1502577
-   Change malfunctions to errors.
-   Justification:
-     There is no reason to invoke malfunction_handler in those failure modes.
-   Votes:
-     +1: danielsh, gstein, stefan2
-
  * r1502909, r1502952
    Make ra_svn sessions reusable after a log callback uses the
    SVN_ERR_CEASE_INVOCATION error.

Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c?rev=1503553&r1=1503552&r2=1503553&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c Tue Jul 16 04:00:14 2013
@@ -2269,7 +2269,9 @@ abort_edit(void *edit_baton,
       && handler->sline.code != 404
       )
     {
-      SVN_ERR_MALFUNCTION();
+      return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+                               _("DELETE returned unexpected status: %d"),
+                               handler->sline.code);
     }
 
   return SVN_NO_ERROR;

Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/util.c?rev=1503553&r1=1503552&r2=1503553&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/util.c Tue Jul 16 04:00:14 2013
@@ -477,7 +477,7 @@ connection_closed(svn_ra_serf__connectio
 {
   if (why)
     {
-      SVN_ERR_MALFUNCTION();
+      return svn_error_wrap_apr(why, NULL);
     }
 
   if (conn->session->using_ssl)



Mime
View raw message