From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 26 Jan 2007 01:05:13 +0000 (+0000)
Subject: 	PR libgcj/29594:
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b05ee0d4d590350b6553ac0d48927441639ebf0;p=thirdparty%2Fgcc.git

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121197 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 37d61bcbb296..142d36da5773 100644
--- 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 baff2de415fe..898b4bb29cab 100644
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 afeac649248b..cf67061d6b78 100644
--- 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 (;;)
 	  {