You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/10 20:27:53 UTC
[1/3] git commit: ACCUMULO-3220 Make sure to re-set the local cipher
variable when it wasn't initialized
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 <el...@apache.org>
Authored: Fri Oct 10 14:26:51 2014 -0400
Committer: Josh Elser <el...@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()) {
[2/3] git commit: ACCUMULO-3220 Make sure to re-set the local cipher
variable when it wasn't initialized
Posted by el...@apache.org.
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/master
Commit: f74bd1827d68a01fd8d164a57c31ed06184649f2
Parents: 5029a44
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 10 14:26:51 2014 -0400
Committer: Josh Elser <el...@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()) {
[3/3] git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bb97fbf8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bb97fbf8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bb97fbf8
Branch: refs/heads/master
Commit: bb97fbf85fa3f2883c97eda050d42b62fa42314b
Parents: 52a1f11 f74bd18
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 10 14:27:38 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 10 14:27:38 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/bb97fbf8/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
----------------------------------------------------------------------