remm        2004/01/26 11:46:44

  Modified:    catalina/src/share/org/apache/catalina/authenticator
                        AuthenticatorBase.java BasicAuthenticator.java
                        FormAuthenticator.java NonLoginAuthenticator.java
                        DigestAuthenticator.java
  Log:
  - Remove compilation warnings.
  
  Revision  Changes    Path
  1.16      +5 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
  
  Index: AuthenticatorBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AuthenticatorBase.java    11 Dec 2003 05:50:39 -0000      1.15
  +++ AuthenticatorBase.java    26 Jan 2004 19:46:44 -0000      1.16
  @@ -380,7 +380,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  
  
  
  1.4       +7 -13     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
  
  Index: BasicAuthenticator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicAuthenticator.java   24 Nov 2003 16:46:56 -0000      1.3
  +++ BasicAuthenticator.java   26 Jan 2004 19:46:44 -0000      1.4
  @@ -97,12 +97,6 @@
   
   
       /**
  -     * The Base64 helper object for this class.
  -     */
  -    protected static final Base64 base64Helper = new Base64();
  -
  -
  -    /**
        * Descriptive information about this implementation.
        */
       protected static final String info =
  @@ -117,7 +111,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  @@ -220,7 +214,7 @@
   
           // Decode and parse the authorization credentials
           String unencoded =
  -          new String(base64Helper.decode(authorization.getBytes()));
  +            new String(Base64.decode(authorization.getBytes()));
           int colon = unencoded.indexOf(':');
           if (colon < 0)
               return (null);
  @@ -247,7 +241,7 @@
   
           // Decode and parse the authorization credentials
           String unencoded =
  -          new String(base64Helper.decode(authorization.getBytes()));
  +          new String(Base64.decode(authorization.getBytes()));
           int colon = unencoded.indexOf(':');
           if (colon < 0)
               return (null);
  
  
  
  1.6       +5 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
  
  Index: FormAuthenticator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FormAuthenticator.java    24 Nov 2003 16:46:56 -0000      1.5
  +++ FormAuthenticator.java    26 Jan 2004 19:46:44 -0000      1.6
  @@ -122,7 +122,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  
  
  
  1.4       +5 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java
  
  Index: NonLoginAuthenticator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NonLoginAuthenticator.java        24 Nov 2003 16:46:56 -0000      1.3
  +++ NonLoginAuthenticator.java        26 Jan 2004 19:46:44 -0000      1.4
  @@ -103,7 +103,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  
  
  
  1.4       +5 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java
  
  Index: DigestAuthenticator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DigestAuthenticator.java  24 Nov 2003 16:46:56 -0000      1.3
  +++ DigestAuthenticator.java  26 Jan 2004 19:46:44 -0000      1.4
  @@ -194,7 +194,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to