This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push: new 157066c96 Simplify Javadoc 157066c96 is described below commit 157066c96ddb22954641199ef80b319607845b7d Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Jan 13 16:06:33 2024 -0500 Simplify Javadoc Better internal name --- .../org/apache/commons/compress/archivers/zip/NioZipEncoding.java | 2 +- .../apache/commons/compress/archivers/zip/ZipEncodingHelper.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java index ac30b66f4..0ae9b351d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java @@ -29,7 +29,7 @@ import java.nio.charset.CoderResult; import java.nio.charset.CodingErrorAction; /** - * A ZipEncoding, which uses a java.nio {@link java.nio.charset.Charset Charset} to encode names. + * A ZipEncoding, which uses a {@link Charset} to encode names. * <p> * The methods of this class are reentrant. * </p> diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java index 0b6215953..75c56ba7e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java @@ -47,13 +47,13 @@ public abstract class ZipEncodingHelper { * @return A ZIP encoding for the given encoding name. */ public static ZipEncoding getZipEncoding(final String name) { - Charset cs = Charset.defaultCharset(); + Charset charset = Charset.defaultCharset(); try { - cs = Charsets.toCharset(name); + charset = Charsets.toCharset(name); } catch (final UnsupportedCharsetException ignore) { // NOSONAR we use the default encoding instead } - final boolean useReplacement = isUTF8(cs.name()); - return new NioZipEncoding(cs, useReplacement); + final boolean useReplacement = isUTF8(charset.name()); + return new NioZipEncoding(charset, useReplacement); } static ByteBuffer growBufferBy(final ByteBuffer buffer, final int increment) {