From 656fc69f39f8d940880ae2e704c87efa5c0e34fa Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Mon, 18 Aug 2014 10:07:09 +0530 Subject: [PATCH] remove trailing comma in options sent to qemu-img --- .../src/org/apache/cloudstack/utils/qemu/QemuImg.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java index 389ac219136..e8dbf926929 100644 --- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java +++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.utils.qemu; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import com.cloud.storage.Storage; @@ -122,8 +123,14 @@ public class QemuImg { if (options != null && !options.isEmpty()) { s.add("-o"); final StringBuilder optionsStr = new StringBuilder(); - for (Map.Entry option : options.entrySet()) { - optionsStr.append(option.getKey()).append('=').append(option.getValue()).append(','); + Iterator> optionsIter = options.entrySet().iterator(); + while(optionsIter.hasNext()){ + Map.Entry option = optionsIter.next(); + optionsStr.append(option.getKey()).append('=').append(option.getValue()); + if(optionsIter.hasNext()){ + //Add "," only if there are more options + optionsStr.append(','); + } } s.add(optionsStr.toString()); }