From b28f3addfc63b6a2bf9e76b0230f716e9ef7f51c Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Wed, 6 Feb 2013 16:49:12 +0100
Subject: [PATCH] If encryption is already initialized we don't need to do it
 again.

---
 .../com/cloud/utils/crypt/EncryptionSecretKeyChecker.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
index c717a3a705d..5ffa14f3088 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;