cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 13 Feb 2015 10:12:47 GMT
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/99739ee3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99739ee3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99739ee3

Branch: refs/heads/trunk
Commit: 99739ee3d1a3a2886d8033db3484a98d243853c7
Parents: 3bb4c30 d6200a8
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Fri Feb 13 10:12:24 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Fri Feb 13 10:12:24 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java   | 2 +-
 src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99739ee3/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99739ee3/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index 2e77a19,38ba76a..250b5dc
--- 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();
+                     writer.close(true);
                  }
 +                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/99739ee3/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
----------------------------------------------------------------------


Mime
View raw message