svn commit: r1581792 - /subversion/trunk/subversion/libsvn_subr/stream.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 26 11:51:08 2014
New Revision: 1581792

URL: http://svn.apache.org/r1581792
Log:
Following up on r1562043, make the data available handler for apr files
handle TIMEUP of the poll request as 'no data available'. Otherwise it
will return this value as an SVN_ERR_STREAM_NOT_SUPPORTED, which is
certainly not expected by ra_svn.

* subversion/libsvn_subr/stream.c
  (data_available_handler_apr): Handle timeout. Wrap error.

Modified:
    subversion/trunk/subversion/libsvn_subr/stream.c

Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1581792&r1=1581791&r2=1581792&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Wed Mar 26 11:51:08 2014
@@ -964,7 +964,7 @@ data_available_handler_apr(void *baton, 
       *data_available = (n > 0);
       return SVN_NO_ERROR;
     }
-  else if (APR_STATUS_IS_EOF(status))
+  else if (APR_STATUS_IS_EOF(status) || APR_STATUS_IS_TIMEUP(status))
     {
       *data_available = FALSE;
       return SVN_NO_ERROR;
@@ -972,7 +972,10 @@ data_available_handler_apr(void *baton, 
   else
     {
       return svn_error_create(SVN_ERR_STREAM_NOT_SUPPORTED,
-                              svn_error_create(status, NULL, NULL),
+                              svn_error_wrap_apr(
+                                  status,
+                                  _("Polling for available data on filestream "
+                                    "failed")),
                               NULL);
     }
 }