You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/29 03:49:31 UTC

[3/6] git commit: make CM.Writer.close idempotent

make CM.Writer.close idempotent


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3eef5409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3eef5409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3eef5409

Branch: refs/heads/trunk
Commit: 3eef54097b8ec96d0bdd71499f944f0484787021
Parents: 8a51a72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:48:49 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:48:49 2013 -0600

----------------------------------------------------------------------
 .../org/apache/cassandra/io/compress/CompressionMetadata.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eef5409/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 7a3f4e7..4cde415 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@ -360,7 +360,8 @@ public class CompressionMetadata
 
         public void close() throws IOException
         {
-            getFD().sync();
+            if (getChannel().isOpen()) // if RAF.closed were public we could just use that, but it's not
+                getChannel().force(true);
             super.close();
         }
     }