You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/29 19:28:12 UTC
svn commit: r1152308 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_subr/subst.c
Author: hwright
Date: Fri Jul 29 17:28:11 2011
New Revision: 1152308
URL: http://svn.apache.org/viewvc?rev=1152308&view=rev
Log:
Merge r1150441 from trunk:
* r1150441
Closing a translated stream should close the inner stream.
Justification:
Resolves an open file handle problem on inconsistent newlines.
(And may cause different problems when behavior is attachted to stream
close, like with checksum streams)
Votes:
+1: rhuijben, danielsh, hwright
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/subst.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 17:28:11 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150242,1150372,1150812,1151036,1152129
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150812,1151036,1152129
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1152308&r1=1152307&r2=1152308&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 29 17:28:11 2011
@@ -204,12 +204,3 @@ Approved changes:
this revision depends for a clean merge).
Votes:
+1: rhuijben, danielsh, cmpilato
-
- * r1150441
- Closing a translated stream should close the inner stream.
- Justification:
- Resolves an open file handle problem on inconsistent newlines.
- (And may cause different problems when behavior is attachted to stream
- close, like with checksum streams)
- Votes:
- +1: rhuijben, danielsh, hwright
Modified: subversion/branches/1.7.x/subversion/libsvn_subr/subst.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/subst.c?rev=1152308&r1=1152307&r2=1152308&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/subst.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/subst.c Fri Jul 29 17:28:11 2011
@@ -1267,15 +1267,16 @@ static svn_error_t *
translated_stream_close(void *baton)
{
struct translated_stream_baton *b = baton;
+ svn_error_t *err = NULL;
if (b->written)
- SVN_ERR(translate_chunk(b->stream, b->out_baton, NULL, 0, b->iterpool));
+ err = translate_chunk(b->stream, b->out_baton, NULL, 0, b->iterpool);
- SVN_ERR(svn_stream_close(b->stream));
+ err = svn_error_compose_create(err, svn_stream_close(b->stream));
svn_pool_destroy(b->iterpool);
- return SVN_NO_ERROR;
+ return svn_error_trace(err);
}