etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed compile warning

This commit is contained in:
anthony 2011-06-28 10:56:35 -07:00
parent dbc0abfa69
commit 89b39d6a1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2089,7 +2089,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
// Make sure that there are no user vms in the network that are not Expunged/Error
List<UserVmVO> userVms = _userVmDao.listByNetworkIdAndStates(networkId, null);
List<UserVmVO> userVms = _userVmDao.listByNetworkIdAndStates(networkId);
for (UserVmVO vm : userVms) {
if (!(vm.getState() == VirtualMachine.State.Error || (vm.getState() == VirtualMachine.State.Expunging && vm.getRemoved() != null))) {

2
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
View File

@ -248,7 +248,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
}
SearchCriteria<UserVmVO> sc = UserVmSearch.create();
if (states != null) {
if (states != null && states.length != 0) {
sc.setParameters("states", (Object[]) states);
}
sc.setJoinParameters("nicSearch", "networkId", networkId);