Updated Branches: refs/heads/4.1 17212984c -> 76a5bdac7
Before any database calls are made we need to make sure that encryption is properly initialized if we have an encrypted db.properties.(cherry picked from commit b1d70f7fe340302f180843c01ee6674166d03ee1) 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/76a5bdac Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/76a5bdac Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/76a5bdac Branch: refs/heads/4.1 Commit: 76a5bdac7077e5b6be13024655c5b3fd8013e945 Parents: 1404cf8 Author: Hugo Trippaers <[email protected]> Authored: Wed Feb 6 15:53:50 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Feb 6 23:03:22 2013 +0100 ---------------------------------------------------------------------- utils/src/com/cloud/utils/db/Transaction.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/76a5bdac/utils/src/com/cloud/utils/db/Transaction.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java index d596de2..c1f157e 100755 --- a/utils/src/com/cloud/utils/db/Transaction.java +++ b/utils/src/com/cloud/utils/db/Transaction.java @@ -93,6 +93,12 @@ public class Transaction { } catch (Exception e) { s_logger.error("Unable to register mbean for transaction", e); } + + /* FIXME: We need a better solution for this + * Initialize encryption if we need it for db.properties + */ + EncryptionSecretKeyChecker enc = new EncryptionSecretKeyChecker(); + enc.check(); } private final LinkedList<StackElement> _stack;
