Author: bodewig Date: Sat Aug 24 18:25:16 2013 New Revision: 1517177 URL: http://svn.apache.org/r1517177 Log: allow null-charset for platform's default encoding in arj
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java?rev=1517177&r1=1517176&r2=1517177&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java Sat Aug 24 18:25:16 2013 @@ -119,7 +119,11 @@ public class ArjArchiveInputStream exten while ((nextByte = in.readUnsignedByte()) != 0) { buffer.write(nextByte); } - return new String(buffer.toByteArray(), charset); + if (charset != null) { + return new String(buffer.toByteArray(), charset); + } else { + return new String(buffer.toByteArray()); + } } private void readFully(final DataInputStream in, byte[] b)