Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd04feb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd04feb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd04feb6 Branch: refs/heads/trunk Commit: bd04feb655ee070e4ccdea3f89892d9de7f4c672 Parents: 51293ed 2a167ea Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Feb 13 10:47:07 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Feb 13 10:47:07 2015 +0000 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd04feb6/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java index 250b5dc,af720c0..2e77a19 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@@ -228,19 -227,16 +228,19 @@@ public class SSTableSimpleUnsortedWrite throw new AssertionError("Empty partition"); first = false; } - writer.close(true); + writer.close(); } + catch (Throwable e) + { + JVMStabilityInspector.inspectThrowable(e); + if (writer != null) + writer.abort(); + // Keep only the first exception + if (exception == null) + exception = e; + } } - catch (Throwable e) - { - JVMStabilityInspector.inspectThrowable(e); - if (writer != null) - writer.abort(); - exception = e; - } + } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd04feb6/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java ----------------------------------------------------------------------
