Updated Branches: refs/heads/master c5185c09e -> b1d70f7fe
Before any database calls are made we need to make sure that encryption is properly initialized if we have an encrypted db.properties. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1d70f7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1d70f7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1d70f7f Branch: refs/heads/master Commit: b1d70f7fe340302f180843c01ee6674166d03ee1 Parents: c5185c0 Author: Hugo Trippaers <[email protected]> Authored: Wed Feb 6 15:53:50 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Feb 6 15:55:13 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/b1d70f7f/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;
