accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/5] accumulo git commit: ACCUMULO-3443 Speicfy UTF-8 when comparing header bytes
Date Fri, 19 Dec 2014 22:22:31 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 9a32ec116 -> 42d651e33
  refs/heads/master d798d5121 -> 7db351949


ACCUMULO-3443 Speicfy UTF-8 when comparing header bytes


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

Branch: refs/heads/1.6
Commit: 7b894e72c9ee063fc80286a50258da55be1d0e16
Parents: 9a32ec1
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Dec 19 16:46:15 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Dec 19 16:46:23 2014 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b894e72/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 7158ea8..80e03b8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -263,7 +263,7 @@ public class DfsLogger {
     FSDataInputStream input = fs.open(path);
     DataInputStream decryptingInput = null;
 
-    byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes();
+    byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes(UTF_8);
     byte[] magicBuffer = new byte[magic.length];
     try {
       input.readFully(magicBuffer);
@@ -286,7 +286,7 @@ public class DfsLogger {
         }
       } else {
         input.seek(0);
-        byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes();
+        byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes(UTF_8);
         byte[] magicBufferV2 = new byte[magicV2.length];
         input.readFully(magicBufferV2);
 


Mime
View raw message