You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2011/03/08 01:56:54 UTC
svn commit: r1079057 - in /avro/branches/branch-1.5: ./ CHANGES.txt
lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java
lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java
Author: cutting
Date: Tue Mar 8 00:56:54 2011
New Revision: 1079057
URL: http://svn.apache.org/viewvc?rev=1079057&view=rev
Log:
Merge -c 1079055 from trunk to 1.5 branch. Fixes AVRO-775.
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:56:54 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917
+/avro/trunk:1075938,1075993,1078917,1079055
Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1079057&r1=1079056&r2=1079057&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Tue Mar 8 00:56:54 2011
@@ -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
Modified: avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java?rev=1079057&r1=1079056&r2=1079057&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java (original)
+++ avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/DataFileReader.java Tue Mar 8 00:56:54 2011
@@ -230,6 +230,12 @@ public class DataFileReader<D>
}
@Override
+ public void close() throws IOException {
+ in.close();
+ super.close();
+ }
+
+ @Override
public int available() throws IOException {
long remaining = (in.length() - in.tell());
return (remaining > Integer.MAX_VALUE) ? Integer.MAX_VALUE
Modified: avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java?rev=1079057&r1=1079056&r2=1079057&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java (original)
+++ avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/file/SeekableInput.java Tue Mar 8 00:56:54 2011
@@ -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;