java2script
diff --git a/‎sources/net.sf.j2s.java.core/src/javajs/util/Rdr.java‎
Lines changed: 5 additions & 3 deletions b/‎sources/net.sf.j2s.java.core/src/javajs/util/Rdr.java‎
Lines changed: 5 additions & 3 deletions
@@ -107,7 +107,7 @@ public static Map<String, Object> readCifData(GenericCifDataParser parser, Buffe
    * Read a UTF-8 byte array fully, converting it to a String.
    * Called by Jmol's XMLReaders
    * 
-   * @param bis
+   * @param bytes
    * @return a UTF-8 string
    */
   public static String bytesToUTF8String(byte[] bytes) {
@@ -154,7 +154,7 @@ public static BufferedReader getBufferedReader(BufferedInputStream bis, String c
    * This method is specifically for strings that are marked for UTF 8 or 16.
    * 
    * @param bytes
-   * @return
+   * @return UTF-decoded bytes
    */
 	public static String fixUTF(byte[] bytes) {
 		Encoding encoding = getUTFEncoding(bytes);
@@ -596,7 +596,9 @@ public static String getZipRoot(String fileName) {
 
 	public static BufferedWriter getBufferedWriter(OutputStream os, String charSetName) {
 		OutputStreamWriter osw = (OutputStreamWriter) Interface.getInstanceWithParams("java.io.OutputStreamWriter", 
-				new Class<?>[] { java.io.OutputStream.class, String.class }, new Object[] {os, charSetName});
+				new Class<?>[] { java.io.OutputStream.class, String.class }, 
+				new Object[] { os, charSetName == null ? "UTF-8" : charSetName }
+		);
 		/**
 		 * @j2sNative
 		 * return osw.getBufferedWriter();