diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-01-26 01:05:13 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-26 01:05:13 +0000 |
| commit | e8589103525d84febbc25064828b36734a643100 (patch) | |
| tree | 0ff7b2f7b85266bd1b1efa1fa9c345d114f18d8f | |
| parent | 6f75716afbe2d8903aa2f308b2a188832b346dbd (diff) | |
| download | gcc-e8589103525d84febbc25064828b36734a643100.zip gcc-e8589103525d84febbc25064828b36734a643100.tar.gz gcc-e8589103525d84febbc25064828b36734a643100.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/gcj/convert/Convert.class | bin | 5087 -> 4799 bytes | |||
| -rw-r--r-- | libjava/gnu/gcj/convert/Convert.java | 16 |
3 files changed, 13 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 37d61bc..142d36d 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 Binary files differindex baff2de..898b4bb 100644 --- a/libjava/classpath/lib/gnu/gcj/convert/Convert.class +++ b/libjava/classpath/lib/gnu/gcj/convert/Convert.class diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java index afeac64..cf67061 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 (;;) { |