You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/12/12 11:59:04 UTC
svn commit: r486090 - in
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io:
InputStreamReader.java OutputStreamWriter.java
Author: tellison
Date: Tue Dec 12 02:59:03 2006
New Revision: 486090
URL: http://svn.apache.org/viewvc?view=rev&rev=486090
Log:
Apply patch for HARMONY-2556 ([classlib] [luni] Fixes for some minor issues in the java.lang and java.io packages found by Melody)
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java?view=diff&rev=486090&r1=486089&r2=486090
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java Tue Dec 12 02:59:03 2006
@@ -91,7 +91,9 @@
public InputStreamReader(InputStream in, final String enc)
throws UnsupportedEncodingException {
super(in);
- enc.length();
+ if(enc == null) {
+ throw new NullPointerException();
+ }
this.in = in;
try {
decoder = Charset.forName(enc).newDecoder()
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java?view=diff&rev=486090&r1=486089&r2=486090
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java Tue Dec 12 02:59:03 2006
@@ -84,7 +84,9 @@
public OutputStreamWriter(OutputStream out, final String enc)
throws UnsupportedEncodingException {
super(out);
- enc.length();
+ if(enc == null) {
+ throw new NullPointerException();
+ }
this.out = out;
try {
encoder = Charset.forName(enc).newEncoder();