svn commit: r1186796 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/io/compress/DeflateCompressor.java

[slebresne]

Author: slebresne
Date: Thu Oct 20 13:34:59 2011
New Revision: 1186796

URL: http://svn.apache.org/viewvc?rev=1186796&view=rev
Log:
Fix Deflate compressor when compression makes data bigger
patch by slebresne; reviewed by xedin for CASSANDRA-3370

Modified:
    cassandra/branches/cassandra-1.0/CHANGES.txt
    
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1186796&r1=1186795&r2=1186796&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Thu Oct 20 13:34:59 2011
@@ -34,6 +34,8 @@
    (CASSANDRA-3170)
  * fix changing durable_writes keyspace option during CF creation
    (CASSANDRA-3292)
+ * fix Deflate compression when compression actually makes the data bigger
+   (CASSANDRA-3370)
 
 
 1.0.0-final

Modified: 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java?rev=1186796&r1=1186795&r2=1186796&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java
 (original)
+++ 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java
 Thu Oct 20 13:34:59 2011
@@ -76,7 +76,7 @@ public class DeflateCompressor implement
         while (true)
         {
             offs += def.deflate(output.buffer, offs, output.buffer.length - 
offs);
-            if (def.needsInput())
+            if (def.finished())
             {
                 return offs - outputOffset;
             }