If encryption is already initialized we don't need to do it again.(cherry picked from commit b28f3addfc63b6a2bf9e76b0230f716e9ef7f51c)
Signed-off-by: Hugo Trippaers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6287d451 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6287d451 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6287d451 Branch: refs/heads/4.1 Commit: 6287d4512ee1a6ef9477d67d966910ae79a31c2e Parents: 1721298 Author: Hugo Trippaers <[email protected]> Authored: Wed Feb 6 16:49:12 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Feb 6 23:00:19 2013 +0100 ---------------------------------------------------------------------- .../utils/crypt/EncryptionSecretKeyChecker.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6287d451/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java index c717a3a..5ffa14f 100755 --- a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java +++ b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java @@ -71,6 +71,11 @@ public class EncryptionSecretKeyChecker extends AdapterBase implements SystemInt if(encryptionType == null || encryptionType.equals("none")){ return; } + + if (s_useEncryption) { + s_logger.warn("Encryption already enabled, is check() called twice?"); + return; + } s_encryptor.setAlgorithm("PBEWithMD5AndDES"); String secretKey = null;
