Mercurial > hg > openjdk > jdk7 > jdk

changeset 1317:0b6571d4b4b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6855297: Windows build breaks after 6811297 Summary: re-introduced the mistakenly taken out authObj member Reviewed-by: chegar
author jccollet
date Fri, 26 Jun 2009 16:50:58 +0200
parents 5a3a5388756c
children 9f243df213fa a5f7d97c3f82
files src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Fri Jun 26 16:50:58 2009 +0200
@@ -237,6 +237,8 @@
     /* try auth without calling Authenticator */
     private boolean tryTransparentNTLMServer = NTLMAuthentication.supportsTransparentAuth();
     private boolean tryTransparentNTLMProxy = NTLMAuthentication.supportsTransparentAuth();
+    /* Used by Windows specific code */
+    Object authObj;
 
     /* Set if the user is manually setting the Authorization or Proxy-Authorization headers */
     boolean isUserServerAuth;
@@ -1219,6 +1221,7 @@
                             disconnectInternal ();
                             throw new IOException ("Authentication failure");
                         }
+                        authObj = null;
                         doingNTLMp2ndStage = false;
                         continue;
                     }
@@ -1295,6 +1298,7 @@
                             throw new IOException ("Authentication failure");
                         }
                         doingNTLM2ndStage = false;
+                        authObj = null;
                         setCookieHeader();
                         continue;
                     }
@@ -1646,6 +1650,7 @@
                             disconnectInternal();
                             throw new IOException ("Authentication failure");
                         }
+                        authObj = null;
                         doingNTLMp2ndStage = false;
                         continue;
                     }