re PR libgcj/29594 (jv-convert with no args NPE)

	PR libgcj/29594:
	* gnu/gcj/convert/Convert.java (main): Correctly handle missing
	input or output encodings.  Removed unused local variables.

From-SVN: r121197

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 37d61bc..142d36d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-25  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/29594:
+       * gnu/gcj/convert/Convert.java (main): Correctly handle missing
+       input or output encodings.  Removed unused local variables.
+
 2007-01-25  Keith Seitz  <keiths@redhat.com>
 
        * include/jvmti-int.h (_Jv_GetJDWP_JVMTIEnv): Declare.

diff --git a/libjava/classpath/lib/gnu/gcj/convert/Convert.class b/libjava/classpath/lib/gnu/gcj/convert/Convert.class
index baff2de..898b4bb 100644 (file)
Binary files a/libjava/classpath/lib/gnu/gcj/convert/Convert.class and b/libjava/classpath/lib/gnu/gcj/convert/Convert.class differ

diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index afeac64..cf67061 100644 (file)
--- a/libjava/gnu/gcj/convert/Convert.java
+++ b/libjava/gnu/gcj/convert/Convert.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2002, 2005, 2006  Free Software Foundation
+/* Copyright (C) 1999, 2002, 2005, 2006, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -151,12 +151,6 @@ public class Convert
 
     try
       {
-       BytesToUnicode inDecoder
-         = inEncodingName == null ? BytesToUnicode.getDefaultDecoder()
-         : BytesToUnicode.getDecoder(inEncodingName);
-       UnicodeToBytes outEncoder
-         = outEncodingName == null ? UnicodeToBytes.getDefaultEncoder()
-         : UnicodeToBytes.getEncoder(outEncodingName);
        InputStream inStream = inName.equals("-") ? System.in
          : new FileInputStream(inName);
        OutputStream outStream;
@@ -165,9 +159,13 @@ public class Convert
        else
          outStream = new FileOutputStream(outName);
        InputStreamReader in
-         = new InputStreamReader(inStream, inEncodingName);
+         = (inEncodingName == null
+            ? new InputStreamReader(inStream)
+            : new InputStreamReader(inStream, inEncodingName));
        OutputStreamWriter out
-         = new OutputStreamWriter(outStream, outEncodingName);
+         = (outEncodingName == null
+            ? new OutputStreamWriter(outStream)
+            : new OutputStreamWriter(outStream, outEncodingName));
        char[] buffer = new char[2048];
        for (;;)
          {