Author: scottcarey
Date: Wed Jul 31 02:30:50 2013
New Revision: 1508713
URL: http://svn.apache.org/r1508713
Log:
AVRO-1144 Deadlock with FSInput and Hadoop NativeS3FileSystem
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/FsInput.java
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1508713&r1=1508712&r2=1508713&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Wed Jul 31 02:30:50 2013
@@ -134,6 +134,9 @@ Trunk (not yet released)
AVRO-1292. Java: Fix potential client blocking in NettyTransceiver.
(James Baldassari via cutting)
+ AVRO-1144. Java: Deadlock with FSInput and Hadoop NativeS3FileSystem.
+ (scottcarey)
+
Avro 1.7.4 (22 February 2012)
NEW FEATURES
Modified:
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/FsInput.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/FsInput.java?rev=1508713&r1=1508712&r2=1508713&view=diff
==============================================================================
---
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/FsInput.java
(original)
+++
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/FsInput.java
Wed Jul 31 02:30:50 2013
@@ -34,8 +34,8 @@ public class FsInput implements Closeabl
/** Construct given a path and a configuration. */
public FsInput(Path path, Configuration conf) throws IOException {
- this.stream = path.getFileSystem(conf).open(path);
this.len = path.getFileSystem(conf).getFileStatus(path).getLen();
+ this.stream = path.getFileSystem(conf).open(path);
}
public long length() {