1 files changed, 18 insertions, 1 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
index 556c12de..1b7335ee 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
@@ -32,12 +32,15 @@ public class StringUtil {
 	}
 
 	public static String ListToString(List<String> list, String delimiter) {
+		if (list.size() == 0) {
+			return "";
+		}
 		StringBuilder output = new StringBuilder();
 		for (String element : list) {
 			output.append(element).append(delimiter);
 		}
 		String outputStr = output.toString();
-		int endIndex = (list.size() > 1) ? outputStr.length() - (delimiter.length() + 1) : outputStr.length() - delimiter.length();
+		int endIndex = outputStr.length() - delimiter.length();
 		return outputStr.substring(0, endIndex);
 	}
 
@@ -48,4 +51,18 @@ public class StringUtil {
 		}
 		return enumAsArray;
 	}
+
+	public static void main(String args[]) {
+		
+		//Test case for "ListToString"
+		List<String> string = new ArrayList<String>();
+		// Empty list
+		System.out.println(StringUtil.ListToString(string, ", "));
+		// Only one
+		string.add("test");
+		System.out.println(StringUtil.ListToString(string, ",:"));
+		// Multiple
+		string.add("welcome to java");
+		System.out.println(StringUtil.ListToString(string, ""));
+	}
 }