cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1028494 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ExpiringColumn.java
Date Thu, 28 Oct 2010 21:30:27 GMT
Author: jbellis
Date: Thu Oct 28 21:30:26 2010
New Revision: 1028494

URL: http://svn.apache.org/viewvc?rev=1028494&view=rev
Log:
fix ByteBuffer bug in ExpiringColumn.updateDigest.  patch by Sylvain Lebresne and Jake Luciani
for CASSANDRA-1679

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ExpiringColumn.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1028494&r1=1028493&r2=1028494&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Oct 28 21:30:26 2010
@@ -2,6 +2,7 @@ dev
  * log threshold causing memtable flush (CASSANDRA-1675)
  * log type of dropped messages (CASSANDRA-1677)
  * upgrade to SLF4J 1.6.1
+ * fix ByteBuffer bug in ExpiringColumn.updateDigest (CASSANDRA-1679)
 
 
 0.7.0-beta3

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ExpiringColumn.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ExpiringColumn.java?rev=1028494&r1=1028493&r2=1028494&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ExpiringColumn.java
(original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ExpiringColumn.java
Thu Oct 28 21:30:26 2010
@@ -82,8 +82,8 @@ public class ExpiringColumn extends Colu
     @Override
     public void updateDigest(MessageDigest digest)
     {
-        digest.update(name());
-        digest.update(value());
+        digest.update(name.array(), name.position()+name.arrayOffset(), name.remaining());
+        digest.update(value.array(), value.position()+value.arrayOffset(), value.remaining());
         DataOutputBuffer buffer = new DataOutputBuffer();
         try
         {



Mime
View raw message