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

bug 6033: fix merge issue 

status 6033: resolved fixed
This commit is contained in:
anthony 2010-08-26 21:56:16 -07:00
parent cca3282b70
commit cb6cfaca23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -3596,9 +3596,8 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
_host.storagePif1 = storageNic1.pr.uuid;
Nic storageNic2 = getLocalNetwork(conn, _storageNetworkName2);
if (storageNic2 != null) {
_host.storageNetwork2 = storageNic2.nr.uuid;
_host.storagePif2 = storageNic2.pr.uuid;
if (storageNic2 == null) {
storageNic2 = storageNic1;
}
_host.storageNetwork2 = storageNic2.nr.uuid;
_host.storagePif2 = storageNic2.pr.uuid;