Updated Branches: refs/heads/trunk db2c2999d -> 1b8c47524
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b8c4752 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b8c4752 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b8c4752 Branch: refs/heads/trunk Commit: 1b8c47524029b37e7f9309bc1d3169769e5fee62 Parents: db2c299 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Oct 18 17:15:23 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Oct 18 17:15:23 2012 -0500 ---------------------------------------------------------------------- .../io/compress/CompressedRandomAccessReader.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b8c4752/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java index 62e5db9..da35e92 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java @@ -155,10 +155,17 @@ public class CompressedRandomAccessReader extends RandomAccessReader } @Override - public void close() throws IOException + public void close() { super.close(); - source.close(); + try + { + source.close(); + } + catch (IOException e) + { + throw new FSReadError(e, getPath()); + } } @Override
