From e8589103525d84febbc25064828b36734a643100 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 26 Jan 2007 01:05:13 +0000
Subject: [PATCH] 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                             |   6 ++++++
 .../lib/gnu/gcj/convert/Convert.class         | Bin 5087 -> 4799 bytes
 libjava/gnu/gcj/convert/Convert.java          |  16 +++++++---------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 37d61bcbb29..142d36da577 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 baff2de415fec3026514a8f7180e68b79a560fae..898b4bb29cab43fb1daa770ca33d1949040a016d 100644
GIT binary patch
delta 783
zcmY+CS!|3^6vuz}bUO2GR41DBYt$A(Q__-<7>P9XRFM!8Ql1(WA+?u8BIZFX;m!A?
zme>bD+Znzo!_>Z0OYLh>`}*QVg8Ma1#MAwq^FQaGd+t3ihO`d0uKqre1xE0r*{U!s
zlY9<49HG(6n*CI>_uT9gZel`&qnoT^GZj!;;d=cYx6H!lxI-={6oo@4&Z}8oQ#N;D
zS=E9?%j&1rFPU94e{9LLpy*^!bjqu;%0jJ*B5#~iRBn;wOprgT?fx}ST2}vmcb4-(
z)dg>dRX)JylEY=LC_>u4R*^e&=J=AT!0VdBb#8b+tlot_Z4S2xYk5}P!lknVxy|6N
zS8NxD?>Y42zE@!vsfVeV_Prc)Hz9g}Y)p;GYgh5o=zO2}X3Qjq64)7<s!P)(W07Iq
zf}Nx!W+dp5Ayqvr&9Rs<{1SN?{AxFnrlm^>czBvj%ydItVz$~f(wt7vGef{`D9yQ;
zm2Yq|H)gx0Yx`Ur?G#ixTL~xV<yx+tQ{ebqP5kL}O`n^t<#RiM8;d0A6}{tAs82WI
z(=IIxY(}YeSuFKD@Y?b_;tlFGThu2S)EBm?pKMpZ*&znI#9_A-vPTB8QwFh5N=V2k
z_DcnOrIG_u#UYu(VVTYmnL(q}a!}@wlsZz{{g^B#EvsmewH%iXWU%%A_(X#j<Pnc`
zlq2ioJYfimu&m*!Cc%)^JkykeBXOQ<3Xvx(dBIElzfoC12d@ZIpqhBCa}oNgZOqek
zhPt7nH<}`Pn00j0sOgt>ddoZQYf#rsgP5#$_dTYJsAMFie8AH4l=6{J*m|lcpS884
RXXworzG_>=H+^H_`(Ir|&)xt4

delta 1127
zcmaizX>3$g7>1v7I-R=~+DRw$HiAN8=t48rkp37<T&gBTj6VQN!ylS*snfJGWSD_q
zVn!3AF`Ae-zl^v=;<zB);Lgxt6{J{MT#74LQ4kat+;A_R+ZKby;IH$Z?|a|(d%wHv
zx_WG`IWj)96KLc@zj=e6F?oevjm?5to$+*}v!g50k%+H#lc~r}>r?KUC5ff+SVv-|
zYtu)+prX@F-R!PvPj{=suO|g_YHAl<UcA5`GibAgtpanxVp1!apM5kC&it=D&o+(1
zf25p>w<IwU*Jg;~KT_Tjzf8)D;@OjG6*JEco1N^MjQO{CB4y*hQ(lx$sSPUFWAiF|
z1u_;Fgdeji7cJ0uO)#UYeQkRrmWbRM>vmh>tJA5)sifQ9W3rEh8V3Ybmon~1r!Juk
z`;<2XPF7gXG?Nhy*_3ivP*<ZyWUnx01l|->XIB`N<*mtB%1xRa;ccJvPWC?In%hS>
zYV$7d2?A>BN<nGO^5)tWpY?&whkT?e>wKX=Q=OKU+B^L*$8A0)sCpgUi8ZdzKCW{j
zJ8sMjer9teC$qE7YVrBtb>`6$V<Q2|Kt3{9J#AEE8ip|oY--J+Hxw9XbpjIwPZbO&
zP+)s&eW=GH^Ek!;yK`7Y_O;dL*&o&BO*O0mYNL9NvLeH6^YXkN)r*X@Ia))WgHfZ%
zkv2zn0(stwniV?ROQV)!IF`p~lieJ)HxSHG?wF2M61F|w&s{j>7#_zQ(_<`$6V(PN
z4}IcMrA|ll_*52{(~l6NGAYxX%J!C@$UGs&*dR{wlsL!J;ylmDQl6D%>YUDVvWkuJ
zDxQ~hyddY3lTExNZ{$VU%*%2io8@A9<udx@a{8sqCV3ZIWDi@FdtR<%o6ImIAEYQB
zW(St~FFiv3Bjhw^)U8B5l;I2JA_&R{_);N>F7M~8LM7PpUcOQ&z;t;JU-ON6-ywN7
z-*S#1VbRBTs-`hZJV}@0>Ee*OeXo$F!mr{7_9`?}IsM2_%D0Z&rce{ttMB+chHPx+
kTI%^3Q|(jFFZ_z7whHl^vbNO@mHf^h%2x2FN-P=w3n|M&R{#J2

diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index afeac649248..cf67061d6b7 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 (;;)
 	  {