apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix immutable list to add another entry to list

Browse Source
This commit is contained in:
Harikrishna Patnala 2020-07-24 12:44:49 +05:30
parent ed7efdf4d2
commit 5aac6c3f0f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutHelper.java
View File

@ -16,6 +16,7 @@
// under the License. // under the License.
package com.cloud.storage.resource; package com.cloud.storage.resource;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -228,7 +229,7 @@ public class VmwareStorageLayoutHelper implements Configurable {
DatastoreFile srcDsFile = new DatastoreFile(fileDsFullPath); DatastoreFile srcDsFile = new DatastoreFile(fileDsFullPath);
List<String> vSphereFileExtensions = Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")); List<String> vSphereFileExtensions = new ArrayList<>(Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")));
// add flat file format to the above list // add flat file format to the above list
vSphereFileExtensions.add("flat.vmdk"); vSphereFileExtensions.add("flat.vmdk");
for (String linkedCloneExtension : vSphereFileExtensions) { for (String linkedCloneExtension : vSphereFileExtensions) {
@ -267,7 +268,7 @@ public class VmwareStorageLayoutHelper implements Configurable {
s_logger.info("Move " + file.getPath() + " -> " + targetFile.getPath()); s_logger.info("Move " + file.getPath() + " -> " + targetFile.getPath());
dsMo.moveDatastoreFile(file.getPath(), dcMo.getMor(), dsMo.getMor(), targetFile.getPath(), dcMo.getMor(), true); dsMo.moveDatastoreFile(file.getPath(), dcMo.getMor(), dsMo.getMor(), targetFile.getPath(), dcMo.getMor(), true);
List<String> vSphereFileExtensions = Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")); List<String> vSphereFileExtensions = new ArrayList<>(Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")));
// add flat file format to the above list // add flat file format to the above list
vSphereFileExtensions.add("flat.vmdk"); vSphereFileExtensions.add("flat.vmdk");
for (String linkedCloneExtension : vSphereFileExtensions) { for (String linkedCloneExtension : vSphereFileExtensions) {
@ -353,7 +354,7 @@ public class VmwareStorageLayoutHelper implements Configurable {
s_logger.warn("Unable to locate VMDK file: " + fileName); s_logger.warn("Unable to locate VMDK file: " + fileName);
} }
List<String> vSphereFileExtensions = Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")); List<String> vSphereFileExtensions = new ArrayList<>(Arrays.asList(VsphereLinkedCloneExtensions.value().trim().split("\\s*,\\s*")));
vSphereFileExtensions.add("flat.vmdk"); vSphereFileExtensions.add("flat.vmdk");
for (String linkedCloneExtension : vSphereFileExtensions) { for (String linkedCloneExtension : vSphereFileExtensions) {
fileFullPath = getLegacyDatastorePathFromVmdkFileName(dsMo, String.format("%s-%s", volumeName, linkedCloneExtension)); fileFullPath = getLegacyDatastorePathFromVmdkFileName(dsMo, String.format("%s-%s", volumeName, linkedCloneExtension));