Merge -c 1079055 from trunk to 1.5 branch. Fixes AVRO-775.

git-svn-id: https://svn.apache.org/repos/asf/avro/branches/branch-1.5@1079057 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 8, 2011 · b96f626 · b96f626
1 parent cc70fc1
commit b96f626
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -284,6 +284,8 @@ Avro 1.5.0 (4 March 2011)
     AVRO-755. Java: Fix SpecificResponder to correctly handle message
     parameter lists that differ between client and server.  (cutting)
 
+    AVRO-775. Java: Fix a file handle leak in DataFileReader. (cutting)
+
 Avro 1.4.1 (13 October 2010)
 
   NEW FEATURES

diff --git a/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java b/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java
@@ -229,6 +229,12 @@ public long skip(long skip) throws IOException {
     }
   }
 
+    @Override
+    public void close() throws IOException {
+        in.close();
+        super.close();
+    }
+
     @Override
     public int available() throws IOException {
       long remaining = (in.length() - in.tell());

diff --git a/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java b/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java
@@ -18,9 +18,10 @@
 package org.apache.avro.file;
 
 import java.io.IOException;
+import java.io.Closeable;
 
 /** An InputStream that supports seek and tell. */
-public interface SeekableInput {
+public interface SeekableInput extends Closeable {
 
   /** Set the position for the next {@link java.io.InputStream#read(byte[],int,int) read()}. */
   void seek(long p) throws IOException;