Replace custom encoder Constants#encodeASCII by JDK implementation

Ensure that the method still throws an IllegalArgumentException for
malformed input or if the String contains unmappable characters.

Change-Id: I6a340aa1af60c315272ff13b6bf2041ba30c94ca
(cherry picked from commit 0fd76114e3436ac635641d06371fd8833179312d)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
index 5d7eacb4b8ddaf61c416b7f6b583da27b38ca9a9..1a2f735622e5a6a9c4a2af3a06139f13b98368de 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
@@ -12,9 +12,14 @@
 
 package org.eclipse.jgit.lib;
 
+import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.nio.charset.Charset;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.MessageFormat;
@@ -667,14 +672,15 @@ public final class Constants {
         *             the 7-bit ASCII character space.
         */
        public static byte[] encodeASCII(String s) {
-               final byte[] r = new byte[s.length()];
-               for (int k = r.length - 1; k >= 0; k--) {
-                       final char c = s.charAt(k);
-                       if (c > 127)
-                               throw new IllegalArgumentException(MessageFormat.format(JGitText.get().notASCIIString, s));
-                       r[k] = (byte) c;
+               try {
+                       CharsetEncoder encoder = US_ASCII.newEncoder()
+                                       .onUnmappableCharacter(CodingErrorAction.REPORT)
+                                       .onMalformedInput(CodingErrorAction.REPORT);
+                       return encoder.encode(CharBuffer.wrap(s)).array();
+               } catch (CharacterCodingException e) {
+                       throw new IllegalArgumentException(
+                                       MessageFormat.format(JGitText.get().notASCIIString, s), e);
                }
-               return r;
        }
 
        /**