From dc07f37ee47f76880a734366f97fdf8a25c4f260 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Sat, 21 Apr 2012 22:29:12 -0700
Subject: [PATCH] Fixed db upgrade bug: do vnc password encryption only for
 non-removed vms

---
 server/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index fca67707145..401bd4ddb10 100755
--- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -575,7 +575,7 @@ public class Upgrade2214to30 implements DbUpgrade {
         PreparedStatement pstmt = null;
         ResultSet rs = null;
         try {
-            pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance`");
+            pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance` where removed is null");
             rs = pstmt.executeQuery();
             while (rs.next()) {
                 long id = rs.getLong(1);