You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/02/14 23:12:52 UTC
git commit: refs/heads/master - CLOUDSTACK-1277: populating transit
password field to UserVmJoinVO in converting from UserVm to UserVmJoinVO.
Updated Branches:
refs/heads/master 298c5ee06 -> cf7ac9d6c
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cf7ac9d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cf7ac9d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cf7ac9d6
Branch: refs/heads/master
Commit: cf7ac9d6c4f5f85c47a5f4d09d402f4f0f682ba1
Parents: 298c5ee
Author: Min Chen <mi...@citrix.com>
Authored: Thu Feb 14 12:01:40 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Feb 14 12:03:18 2013 -0800
----------------------------------------------------------------------
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf7ac9d6/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 6f5587f..4a5ac33 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -327,7 +327,15 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
}
Set<Long> vmIdSet = userVmDataHash.keySet();
- return searchByIds(vmIdSet.toArray(new Long[vmIdSet.size()]));
+ List<UserVmJoinVO> uvms = searchByIds(vmIdSet.toArray(new Long[vmIdSet.size()]));
+ // populate transit password field from UserVm
+ if ( uvms != null ){
+ for (UserVmJoinVO uvm : uvms){
+ UserVm v = userVmDataHash.get(uvm.getId());
+ uvm.setPassword(v.getPassword());
+ }
+ }
+ return uvms;
}
}