diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/net/Authenticator/B4933582.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Authenticator/B4933582.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2003 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.
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import sun.net.www.protocol.http.*;
+
+public class B4933582 implements HttpCallback {
+
+    static int count = 0;
+    static String authstring;
+
+    void errorReply (HttpTransaction req, String reply) throws IOException {
+        req.addResponseHeader ("Connection", "close");
+        req.addResponseHeader ("WWW-Authenticate", reply);
+        req.sendResponse (401, "Unauthorized");
+        req.orderlyClose();
+    }
+
+    void okReply (HttpTransaction req) throws IOException {
+        req.setResponseEntityBody ("Hello .");
+        req.sendResponse (200, "Ok");
+        req.orderlyClose();
+    }
+
+    static boolean firstTime = true;
+
+    public void request (HttpTransaction req) {
+        try {
+            authstring = req.getRequestHeader ("Authorization");
+            if (firstTime) {
+                switch (count) {
+                case 0:
+                    errorReply (req, "Basic realm=\"wallyworld\"");
+                    break;
+                case 1:
+                    /* client stores a username/pw for wallyworld
+                     */
+                    save (authstring);
+                    okReply (req);
+                    break;
+                }
+            } else {
+                /* check the auth string is premptively set from last time */
+                String savedauth = retrieve();
+                if (savedauth.equals (authstring)) {
+                    okReply (req);
+                } else {
+                    System.out.println ("savedauth = " + savedauth);
+                    System.out.println ("authstring = " + authstring);
+                    errorReply (req, "Basic realm=\"wallyworld\"");
+                }
+            }
+            count ++;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    void save (String s) {
+        try {
+            FileOutputStream f = new FileOutputStream ("auth.save");
+            ObjectOutputStream os = new ObjectOutputStream (f);
+            os.writeObject (s);
+        } catch (IOException e) {
+            assert false;
+        }
+    }
+
+    String retrieve () {
+        String s = null;
+        try {
+            FileInputStream f = new FileInputStream ("auth.save");
+            ObjectInputStream is = new ObjectInputStream (f);
+            s = (String) is.readObject();
+        } catch (Exception e) {
+            assert false;
+        }
+        return s;
+    }
+
+    static void read (InputStream is) throws IOException {
+        int c;
+        System.out.println ("reading");
+        while ((c=is.read()) != -1) {
+            System.out.write (c);
+        }
+        System.out.println ("");
+        System.out.println ("finished reading");
+    }
+
+    static void client (String u) throws Exception {
+        URL url = new URL (u);
+        System.out.println ("client opening connection to: " + u);
+        URLConnection urlc = url.openConnection ();
+        InputStream is = urlc.getInputStream ();
+        read (is);
+        is.close();
+    }
+
+    static HttpServer server;
+
+    public static void main (String[] args) throws Exception {
+        firstTime = args[0].equals ("first");
+        MyAuthenticator auth = new MyAuthenticator ();
+        Authenticator.setDefault (auth);
+        AuthCacheValue.setAuthCache (new CacheImpl());
+        try {
+            server = new HttpServer (new B4933582(), 1, 10, 5009);
+            System.out.println ("Server: listening on port: " + server.getLocalPort());
+            client ("http://localhost:"+server.getLocalPort()+"/d1/foo.html");
+        } catch (Exception e) {
+            if (server != null) {
+                server.terminate();
+            }
+            throw e;
+        }
+        int f = auth.getCount();
+        if (firstTime && f != 1) {
+            except ("Authenticator was called "+f+" times. Should be 1");
+        }
+        if (!firstTime && f != 0) {
+            except ("Authenticator was called "+f+" times. Should be 0");
+        }
+        server.terminate();
+    }
+
+    public static void except (String s) {
+        server.terminate();
+        throw new RuntimeException (s);
+    }
+
+    static class MyAuthenticator extends Authenticator {
+        MyAuthenticator () {
+            super ();
+        }
+
+        int count = 0;
+
+        public PasswordAuthentication getPasswordAuthentication () {
+            PasswordAuthentication pw;
+            pw = new PasswordAuthentication ("user", "pass1".toCharArray());
+            count ++;
+            return pw;
+        }
+
+        public int getCount () {
+            return (count);
+        }
+    }
+
+    static class CacheImpl extends AuthCacheImpl {
+        HashMap map;
+        CacheImpl () throws IOException {
+            super();
+            File src = new File ("cache.ser");
+            if (src.exists()) {
+                ObjectInputStream is = new ObjectInputStream (
+                    new FileInputStream (src)
+                );
+                try {
+                    map = (HashMap)is.readObject ();
+                } catch (ClassNotFoundException e) {
+                    assert false;
+                }
+                is.close();
+                System.out.println ("setMap from cache.ser");
+            } else {
+                map = new HashMap();
+            }
+            setMap (map);
+        }
+
+        private void writeMap () {
+            try {
+                File dst = new File ("cache.ser");
+                dst.delete();
+                if (!dst.createNewFile()) {
+                    return;
+                }
+                ObjectOutputStream os = new ObjectOutputStream (
+                        new FileOutputStream (dst)
+                );
+                os.writeObject(map);
+                os.close();
+            } catch (IOException e) {}
+        }
+
+        public void put (String pkey, AuthCacheValue value) {
+            System.out.println ("put: " + pkey + " " + value);
+            super.put (pkey, value);
+            writeMap();
+        }
+
+        public AuthCacheValue get (String pkey, String skey) {
+            System.out.println ("get: " + pkey + " " + skey);
+            AuthCacheValue i = super.get (pkey, skey);
+            System.out.println ("---> " + i);
+            return i;
+        }
+
+        public void remove (String pkey, AuthCacheValue value) {
+            System.out.println ("remove: " + pkey + " " + value);
+            super.remove (pkey, value);
+            writeMap();
+        }
+    }
+}