avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dcrea...@apache.org
Subject svn commit: r1102338 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/c/src/avro_private.h
Date Thu, 12 May 2011 15:08:51 GMT
Author: dcreager
Date: Thu May 12 15:08:51 2011
New Revision: 1102338

URL: http://svn.apache.org/viewvc?rev=1102338&view=rev
Log:
Merge change 1102335 from trunk into 1.5 branch

Modified:
    avro/branches/branch-1.5/   (props changed)
    avro/branches/branch-1.5/CHANGES.txt
    avro/branches/branch-1.5/lang/c/src/avro_private.h

Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 12 15:08:51 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1102332
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1102332,1102335

Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1102338&r1=1102337&r2=1102338&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Thu May 12 15:08:51 2011
@@ -10,6 +10,8 @@ Avro 1.5.2 (unreleased)
 
     AVRO-818. C: Fix data file corruption bug in C library (dcreager)
 
+    AVRO-819. C: Fix file reader EOF detection (dcreager)
+
 Avro 1.5.1 (3 May 2011)
 
   NEW FEATURES

Modified: avro/branches/branch-1.5/lang/c/src/avro_private.h
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/c/src/avro_private.h?rev=1102338&r1=1102337&r2=1102338&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/c/src/avro_private.h (original)
+++ avro/branches/branch-1.5/lang/c/src/avro_private.h Thu May 12 15:08:51 2011
@@ -33,6 +33,7 @@
 		rval = call;				\
 		if (rval) {				\
 			avro_set_error(__VA_ARGS__);	\
+			return rval;			\
 		}					\
 	}
 
@@ -41,6 +42,7 @@
 		rval = call;				\
 		if (rval) {				\
 			avro_prefix_error(__VA_ARGS__);	\
+			return rval;			\
 		}					\
 	}
 



Mime
View raw message