accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/5] accumulo git commit: ACCUMULO-3188 Skip unnecessary (re-)read of header bytes
Date Fri, 19 Dec 2014 22:22:34 GMT
ACCUMULO-3188 Skip unnecessary (re-)read of header bytes


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

Branch: refs/heads/1.6
Commit: 42d651e3358c081f3a303553ce95a214147f273d
Parents: 7b894e7
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Dec 19 17:16:52 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Dec 19 17:16:52 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/42d651e3/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 80e03b8..df8dc7a 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
@@ -316,8 +316,8 @@ public class DfsLogger {
 
             CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
 
-            input.seek(0);
-            input.readFully(magicBufferV2);
+            // go back to the beginning, but skip over magicV2 already checked earlier
+            input.seek(magicV2.length);
             params.setEncryptedInputStream(input);
 
             params = cryptoModule.getDecryptingInputStream(params);


Mime
View raw message