accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] git commit: ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized
Date Fri, 10 Oct 2014 18:27:53 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 5029a4422 -> f74bd1827
  refs/heads/master 52a1f1124 -> bb97fbf85


ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized


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

Branch: refs/heads/1.6
Commit: f74bd1827d68a01fd8d164a57c31ed06184649f2
Parents: 5029a44
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 10 14:26:51 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 10 14:26:51 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/security/crypto/DefaultCryptoModule.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74bd182/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index 0ebbd5d..a3787f0 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -247,6 +247,7 @@ public class DefaultCryptoModule implements CryptoModule {
     Cipher cipher = params.getCipher();
     if (cipher == null) {
       initializeCipher(params);
+      cipher = params.getCipher();
     }
 
     if (0 == cipher.getBlockSize()) {


Mime
View raw message