cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject cassandra git commit: fix bad merge
Date Wed, 18 Mar 2015 10:54:22 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 144644bbf -> 7bef6f93a


fix bad merge


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

Branch: refs/heads/trunk
Commit: 7bef6f93aea3a6897b53e909688f5948c018ccdf
Parents: 144644b
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Mar 18 10:54:05 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Mar 18 10:54:05 2015 +0000

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bef6f93/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
index 4cf3517..2f9550e 100644
--- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
+++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
@@ -104,7 +104,7 @@ public class DataIntegrityMetadata
         public FileDigestValidator(Descriptor descriptor) throws IOException
         {
             this.descriptor = descriptor;
-            checksum = descriptor.version.hasAllAdlerChecksums() ? new Adler32() : new PureJavaCrc32();
+            checksum = descriptor.version.hasAllAdlerChecksums() ? new Adler32() : CRC32Factory.instance.create();
             digestReader = RandomAccessReader.open(new File(descriptor.filenameFor(Component.DIGEST)));
             dataReader = RandomAccessReader.open(new File(descriptor.filenameFor(Component.DATA)));
             try


Mime
View raw message