commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth HttpAuthenticator.java
Date Sat, 09 Aug 2003 18:20:34 GMT
olegk       2003/08/09 11:20:34

  Modified:    httpclient/src/java/org/apache/commons/httpclient/auth Tag:
                        HTTPCLIENT_2_0_BRANCH HttpAuthenticator.java
  Log:
  Minor corrections to my previous patch
  
  Contributed by Oleg Kalnichevski
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.2   +8 -8      jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
  
  Index: HttpAuthenticator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- HttpAuthenticator.java	8 Aug 2003 06:38:06 -0000	1.7.2.1
  +++ HttpAuthenticator.java	9 Aug 2003 18:20:34 -0000	1.7.2.2
  @@ -301,10 +301,6 @@
               }
           }
           String realm = authscheme.getRealm();
  -        // TODO: To be removed in the future. Required for backward compatibility
  -        if (realm == null) {
  -            realm = host;
  -        }
           if (LOG.isDebugEnabled()) {
               StringBuffer buffer = new StringBuffer();
               buffer.append("Authenticating with the "); 
  @@ -312,12 +308,16 @@
                   buffer.append("default");
               } else {
                   buffer.append('\'');
  -                buffer.append(authscheme.getRealm());
  +                buffer.append(realm);
                   buffer.append('\'');
               }
               buffer.append(" authentication realm at "); 
               buffer.append(host); 
               LOG.debug(buffer.toString());
  +        }
  +        // TODO: To be removed in the future. Required for backward compatibility
  +        if (realm == null) {
  +            realm = host;
           }
           Credentials credentials = proxy 
               ? state.getProxyCredentials(realm, host) 
  
  
  

Mime
View raw message