Skip to content

Commit f632428

Browse files
committed
remove duplicate import due to merge conflict
1 parent 0ba42ce commit f632428

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

server/src/main/java/com/cloud/server/ManagementServerImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import javax.naming.ConfigurationException;
4646

4747
import com.cloud.cpu.CPU;
48-
import com.cloud.utils.security.CertificateHelper;
4948
import org.apache.cloudstack.acl.ControlledEntity;
5049
import org.apache.cloudstack.acl.SecurityChecker;
5150
import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@@ -1617,8 +1616,7 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
16171616
// Only list hosts of the same architecture as the source Host in a multi-arch zone
16181617
List<CPU.CPUArch> clusterArchs = ApiDBUtils.listZoneClustersArchs(vm.getDataCenterId());
16191618
if (CollectionUtils.isNotEmpty(clusterArchs) && clusterArchs.size() > 1) {
1620-
CPU.CPUArch hostArch = srcHost.getArch();
1621-
suitableHosts = suitableHosts.stream().filter(h -> h.getArch() == hostArch).collect(Collectors.toList());
1619+
suitableHosts = suitableHosts.stream().filter(h -> h.getArch() == srcHost.getArch()).collect(Collectors.toList());
16221620
}
16231621

16241622
return new Ternary<>(otherHosts, suitableHosts, requiresStorageMotion);

0 commit comments

Comments
 (0)