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

libjava/ChangeLog

+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.

libjava/gnu/gcj/convert/Convert.java

-/* 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 (;;)
 	  {