Merge branch 'ticket/237' into develop

James Moger

2015-02-11 5ec94c4282ed3630b7b4cd0fb5db62c20ce46d9d

Merge branch 'ticket/237' into develop

 src/main/java/com/gitblit/manager/RepositoryManager.java

@@ -1921,12 +1921,14 @@

        try {
            // issue-486/ticket-151: UTF-9 & UTF-18
            // issue-560/ticket-237: 'UTF8'
            Field field = RawParseUtils.class.getDeclaredField("encodingAliases");
            field.setAccessible(true);
            Map<String, Charset> encodingAliases = (Map<String, Charset>) field.get(null);
            encodingAliases.put("'utf8'", RawParseUtils.UTF8_CHARSET);
            encodingAliases.put("utf-9", RawParseUtils.UTF8_CHARSET);
            encodingAliases.put("utf-18", RawParseUtils.UTF8_CHARSET);
            logger.info("Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit");
            logger.info("Alias 'UTF8', UTF-9 & UTF-18 encodings as UTF-8 in JGit");
        } catch (Throwable t) {
            logger.error("Failed to inject UTF-9 & UTF-18 encoding aliases into JGit", t);
        }