Index: src/main/java/java/nio/charset/Charset.java =================================================================== --- src/main/java/java/nio/charset/Charset.java (revision 485241) +++ src/main/java/java/nio/charset/Charset.java (working copy) @@ -180,7 +180,11 @@ // check whether the given canonical name is legal checkCharsetName(canonicalName); this.canonicalName = canonicalName; +<<<<<<< .mine + // check each aliases and put into a set +======= // check each alias and put into a set +>>>>>>> .r484977 this.aliasesSet = new HashSet(); if (null != aliases) { for (int i = 0; i < aliases.length; i++) { Index: src/main/java/java/nio/charset/CharsetEncoder.java =================================================================== --- src/main/java/java/nio/charset/CharsetEncoder.java (revision 485241) +++ src/main/java/java/nio/charset/CharsetEncoder.java (working copy) @@ -35,7 +35,7 @@ *
  • Invoking the {@link #reset() reset} method to reset the encoder if the * encoder has been used;
  • *
  • Invoking the {@link #encode(CharBuffer, ByteBuffer, boolean) encode} - * method until the addtional input is not needed, the endOfInput + * method until the additional input is not needed, the endOfInput * parameter must be set to false, the input buffer must be filled and the * output buffer must be flushed between invocations;
  • *
  • Invoking the {@link #encode(CharBuffer, ByteBuffer, boolean) encode}