Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8EC21186A3 for ; Wed, 19 Aug 2015 12:39:14 +0000 (UTC) Received: (qmail 5146 invoked by uid 500); 19 Aug 2015 12:39:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5115 invoked by uid 500); 19 Aug 2015 12:39:14 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 4842 invoked by uid 99); 19 Aug 2015 12:39:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 12:39:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B29AE0566; Wed, 19 Aug 2015 12:39:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 19 Aug 2015 12:39:14 -0000 Message-Id: <0d50a4a6c99742f680d3af728f1152e2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Fixed COVERITY defects for CASSANDRA-7066 Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d12d2d496 -> 00bcccc8c refs/heads/trunk 036f6b77d -> 53e73df65 Fixed COVERITY defects for CASSANDRA-7066 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00bcccc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00bcccc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00bcccc8 Branch: refs/heads/cassandra-3.0 Commit: 00bcccc8c9f0c2819c162a49367d5072b0c49de5 Parents: d12d2d4 Author: Stefania Alborghetti Authored: Tue Aug 18 08:34:25 2015 +0800 Committer: Benedict Elliott Smith Committed: Wed Aug 19 13:38:22 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/lifecycle/TransactionLog.java | 4 ++-- src/java/org/apache/cassandra/io/util/FileUtils.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00bcccc8/src/java/org/apache/cassandra/db/lifecycle/TransactionLog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/lifecycle/TransactionLog.java b/src/java/org/apache/cassandra/db/lifecycle/TransactionLog.java index 4b18749..6bc2eeb 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/TransactionLog.java +++ b/src/java/org/apache/cassandra/db/lifecycle/TransactionLog.java @@ -228,7 +228,7 @@ public class TransactionLog extends Transactional.AbstractTransactional implemen public byte[] getBytes() { - return record.getBytes(); + return record.getBytes(FileUtils.CHARSET); } public boolean verify(String parentFolder, boolean lastRecordIsCorrupt) @@ -360,7 +360,7 @@ public class TransactionLog extends Transactional.AbstractTransactional implemen return Record.make(line, isLast); } - byte[] bytes = matcher.group(1).getBytes(); + byte[] bytes = matcher.group(1).getBytes(FileUtils.CHARSET); checksum.update(bytes, 0, bytes.length); if (checksum.getValue() != Long.valueOf(matcher.group(2))) http://git-wip-us.apache.org/repos/asf/cassandra/blob/00bcccc8/src/java/org/apache/cassandra/io/util/FileUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java index 0ba2307..920eee0 100644 --- a/src/java/org/apache/cassandra/io/util/FileUtils.java +++ b/src/java/org/apache/cassandra/io/util/FileUtils.java @@ -21,13 +21,12 @@ import java.io.*; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.*; import java.text.DecimalFormat; import java.util.Arrays; -import java.util.Collections; import java.util.List; -import org.apache.cassandra.config.Config; import sun.nio.ch.DirectBuffer; import org.slf4j.Logger; @@ -49,6 +48,8 @@ import static org.apache.cassandra.utils.Throwables.merge; public class FileUtils { + public static final Charset CHARSET = StandardCharsets.UTF_8; + private static final Logger logger = LoggerFactory.getLogger(FileUtils.class); private static final double KB = 1024d; private static final double MB = 1024*1024d; @@ -601,7 +602,7 @@ public class FileUtils { Files.write(file.toPath(), Arrays.asList(lines), - Charset.forName("utf-8"), + CHARSET, op); } catch (IOException ex) @@ -614,7 +615,7 @@ public class FileUtils { try { - return Files.readAllLines(file.toPath(), Charset.forName("utf-8")); + return Files.readAllLines(file.toPath(), CHARSET); } catch (IOException ex) {