You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by to...@apache.org on 2014/11/17 16:33:47 UTC
svn commit: r1640173 - in /avro/branches/branch-1.7/lang/java/avro/src:
main/java/org/apache/avro/file/DataFileStream.java
test/java/org/apache/avro/TestDataFileCorruption.java
Author: tomwhite
Date: Mon Nov 17 15:33:47 2014
New Revision: 1640173
URL: http://svn.apache.org/r1640173
Log:
Merge -r 1640170:1640171 from trunk to branch. Fixes: AVRO-1596. Java: Cannot read past corrupted block in Avro data file.
Added:
avro/branches/branch-1.7/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
- copied unchanged from r1640171, avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
Modified:
avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
Modified: avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java?rev=1640173&r1=1640172&r2=1640173&view=diff
==============================================================================
--- avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java (original)
+++ avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java Mon Nov 17 15:33:47 2014
@@ -289,9 +289,9 @@ public class DataFileStream<D> implement
// throws if it can't read the size requested
vin.readFixed(reuse.data, 0, reuse.blockSize);
vin.readFixed(syncBuffer);
+ availableBlock = false;
if (!Arrays.equals(syncBuffer, header.sync))
throw new IOException("Invalid sync!");
- availableBlock = false;
return reuse;
}