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

fix problems after merging in bug fixes from 2.1.x

This commit is contained in:
Chiradeep Vittal 2010-11-01 12:27:15 -07:00
parent 8a1245d433
commit 76c7b54fc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
View File

@ -298,7 +298,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
public List<DomainRouterVO> listByVlanDbId(Long vlanDbId) {
SearchCriteria<DomainRouterVO> sc = VlanDbIdSearch.create();
sc.setParameters("vlanDbId", vlanDbId);
return listActiveBy(sc);
return listBy(sc);
}
@Override

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2564,7 +2564,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
txn.start();
_vmDao.updateIf(vm, Event.OperationSucceeded, host.getId());
txn.commit();
_networkGroupManager.handleVmStateTransition(vm, State.Running);
_networkGroupMgr.handleVmStateTransition(vm, State.Running);
return true;
} catch(Exception e) {
s_logger.warn("Exception during completion of migration process " + vm.toString());