--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/charset/coders/StreamTimeout.java	Wed Jan 27 19:39:55 2010 -0800
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 4521942
+ * @summary Ensure that InputStreamReaders work properly
+ *          when the underlying byte stream times out
+ */
+
+import java.net.*;
+import java.io.*;
+
+
+public class StreamTimeout {
+
+    private static PrintStream log = System.err;
+
+    private static String charset = "US-ASCII";
+
+    private static Object lock = new Object();
+    private static synchronized void waitABit(int millisec) {
+        synchronized(lock) {
+            try {
+                lock.wait(millisec);
+            } catch (InterruptedException e) {
+                //ignore
+            }
+        }
+    }
+
+    private static class Client extends Thread {
+        public void run() {
+            try {
+                Socket so = new Socket("127.0.0.1", 22222);
+                Writer wr = new OutputStreamWriter(so.getOutputStream(),
+                                                   charset);
+                wr.write("ab");
+                wr.flush();
+            } catch (IOException x) {
+                log.print("Unexpected exception in writer: ");
+                x.printStackTrace();
+                System.exit(1);
+            }
+        }
+    }
+
+    private static void gobble(InputStream is, Reader rd,
+                               int ec, boolean force)
+        throws Exception
+    {
+        int a = is.available();
+        boolean r = rd.ready();
+        log.print("" + a + " bytes available, "
+                  + "reader " + (r ? "" : "not ") + "ready");
+        if (!r && !force) {
+            log.println();
+            return;
+        }
+        int c;
+        try {
+            c = rd.read();
+        } catch (InterruptedIOException x) {
+            log.println();
+            throw x;
+        }
+        log.println(", read() ==> "
+                    + (c >= 0 ? ("'" + (char)c + "'" ): "EOF"));
+        if (c != ec)
+            throw new Exception("Incorrect value read: Expected "
+                                + ec + ", read " + (char)c);
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        if (args.length > 0)
+            charset = args[0];
+
+        ServerSocket ss = new ServerSocket(22222);
+        Thread cl = new Client();
+        cl.start();
+        Socket s = ss.accept();
+        s.setSoTimeout(150);
+        InputStream is = s.getInputStream();
+        Reader rd = new InputStreamReader(is, charset);
+
+        while (is.available() <= 0)
+            Thread.yield();
+
+        gobble(is, rd, 'a', false);
+        gobble(is, rd, 'b', false);
+        gobble(is, rd, -1, false);
+
+        boolean caught = false;
+        try {
+            gobble(is, rd, -1, true);
+        } catch (InterruptedIOException e) {
+            log.println("Read timed out, as expected");
+            caught = true;
+        }
+        if (!caught) {
+            log.println("Read did not time out, test inapplicable");
+            return;
+        }
+
+        caught = false;
+        try {
+            gobble(is, rd, -1, true);
+        } catch (InterruptedIOException x) {
+            log.println("Second read timed out, as expected");
+            caught = true;
+        }
+        if (!caught)
+            throw new Exception("Second read completed");
+
+    }
+
+}