From 4d44ddfc995bf53d6e1fb8f224589f71ac235be4 Mon Sep 17 00:00:00 2001
From: Chris Goffinet <goffinet@apache.org>
Date: Tue, 10 Nov 2009 05:18:54 +0000
Subject: [PATCH] merge with cassandra-0.4 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834351 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 6f09a43885..5a1e47da37 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -443,7 +443,7 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
 
     public void forceFlushBinary()
     {
-        if (memtable_.isClean())
+        if (binaryMemtable_.get().isClean())
             return;
 
         submitFlush(binaryMemtable_.get());