CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in

minchen07 · minchen07 · commit cf7ac9d6c4f5 · 2013-02-14T12:03:18.000-08:00
converting from UserVm to UserVmJoinVO.
diff --git 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 List<UserVmJoinVO> newUserVmView(UserVm... userVms) {
         }
 
         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;
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,15 @@ public List<UserVmJoinVO> newUserVmView(UserVm... userVms) {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`Set<Long> vmIdSet = userVmDataHash.keySet();`
`330`		`- return searchByIds(vmIdSet.toArray(new Long[vmIdSet.size()]));`
	`330`	`+ List<UserVmJoinVO> uvms = searchByIds(vmIdSet.toArray(new Long[vmIdSet.size()]));`
	`331`	`+ // populate transit password field from UserVm`
	`332`	`+ if ( uvms != null ){`
	`333`	`+ for (UserVmJoinVO uvm : uvms){`
	`334`	`+ UserVm v = userVmDataHash.get(uvm.getId());`
	`335`	`+ uvm.setPassword(v.getPassword());`
	`336`	`+ }`
	`337`	`+ }`
	`338`	`+ return uvms;`
`331`	`339`	`}`
`332`	`340`
`333`	`341`	`}`