Changeset 7641

Timestamp:

03/05/11 15:39:38 (9 years ago)

Author:

curtis

Message:

Fix more warnings.

Location:

trunk/projects/wiscscan-java/src/main/java/loci/wiscscan/auth

Files:

• AutoLoginHandler.java (modified) (1 diff)
• KerberosAuth.java (modified) (3 diffs)

trunk/projects/wiscscan-java/src/main/java/loci/wiscscan/auth/AutoLoginHandler.java

@@ -52 +52 @@
          * This is the constructor which takes in the username and password to send
          * the JAAS call.
-         * @param Credentials This is the object containing the login info
+         * @param credentials This is the object containing the login info
          */
         public AutoLoginHandler( Credentials credentials ) {

trunk/projects/wiscscan-java/src/main/java/loci/wiscscan/auth/KerberosAuth.java

@@ -52 +52 @@
          * Attempts to log-in with the specified username and password.
          *
-         * @return true if successfully logged in.
-         * @return false if unable to log in.
+         * @return true if successfully logged in, false if unable to log in.
          */
         public static boolean tryLogin(String username, String password) {
-                boolean returnValue = true;
-                
                 // Create the credentials file
                 Credentials credentials = new Credentials();
@@ -69 +66 @@
                 catch (LoginException le) {
                         System.err.println("Cannot create LoginContext. " + le.getMessage());
-                        returnValue = false;
+                        return false;
                 }
                 catch (SecurityException se) {
-                        returnValue = false;
+                        return false;
                 }
 
@@ -82 +79 @@
                         System.err.println("Authentication failed:");
                         System.err.println("  " + le.getMessage());
-                        returnValue = false;
+                        return false;
                 }
 
-                return returnValue;
+                return true;
         }
 }