You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/06/28 07:47:25 UTC
[2/2] git commit: updated refs/heads/master to 87a5dc5
encrypt vnc_password for removed Vms also. Snapshots of removed Vms still refer Vm VOs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87a5dc58
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87a5dc58
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87a5dc58
Branch: refs/heads/master
Commit: 87a5dc582e3400d2b825522e9bb2ca949363458f
Parents: 7713c5c
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Jun 27 17:39:05 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri Jun 28 11:13:02 2013 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87a5dc58/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index 2d77429..e1b56df 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -462,7 +462,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
ResultSet rs = null;
try {
int numRows = 0;
- pstmt = conn.prepareStatement("select count(id) from `cloud`.`vm_instance` where removed is null");
+ pstmt = conn.prepareStatement("select count(id) from `cloud`.`vm_instance`");
rs = pstmt.executeQuery();
if(rs.next()){
numRows = rs.getInt(1);
@@ -471,7 +471,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
pstmt.close();
int offset = 0;
while(offset < numRows){
- pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance` where removed is null limit "+offset+", 500");
+ pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance` limit "+offset+", 500");
rs = pstmt.executeQuery();
while (rs.next()) {
long id = rs.getLong(1);