diff --git a/utils/src/com/cloud/utils/StringUtils.java b/utils/src/com/cloud/utils/StringUtils.java index 74dbd4dcc4c..73b49fc9249 100644 --- a/utils/src/com/cloud/utils/StringUtils.java +++ b/utils/src/com/cloud/utils/StringUtils.java @@ -19,6 +19,7 @@ package com.cloud.utils; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -32,6 +33,21 @@ import org.owasp.esapi.StringUtilities; public class StringUtils { private static final char[] hexChar = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + private static Charset preferredACSCharset; + + { + String preferredCharset = "UTF-8"; + if (Charset.isSupported(preferredCharset)) { + preferredACSCharset = Charset.forName(preferredCharset); + } else { + preferredACSCharset = Charset.defaultCharset(); + } + } + + public static Charset getPreferredCharset() { + return preferredACSCharset; + } + public static String join(Iterable iterable, String delim) { StringBuilder sb = new StringBuilder(); if (iterable != null) {