18093 login history mechanism should not log error if history file doesn't exist
authorStephen Talley <stephen.talley@oracle.com>
Mon, 28 Mar 2011 10:29:45 -0400
changeset 684 f7b1d1fbdb8e
parent 683 7acfa1998d54
child 685 767674b0a2fb
18093 login history mechanism should not log error if history file doesn't exist
usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/LoginHistoryManager.java
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/LoginHistoryManager.java	Mon Mar 28 10:29:24 2011 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/LoginHistoryManager.java	Mon Mar 28 10:29:45 2011 -0400
@@ -27,7 +27,6 @@
 
 import java.io.*;
 import java.util.*;
-import java.util.List;
 import java.util.logging.*;
 import javax.swing.event.*;
 import org.opensolaris.os.vp.panel.common.*;
@@ -224,9 +223,12 @@
 
     // Read persistent login history.
     private void readLogins() {
-	// Ensure file exists.
-	if (loginFile.exists() && !loginFile.canRead()) {
-	    String message = "Cannot read login history: " +
+	if (!loginFile.exists()) {
+	    return;
+	}
+
+	if (!loginFile.canRead()) {
+	    String message = "cannot read login history: " +
 		loginFile.getAbsolutePath();
 	    Logger.getLogger(getClass().getName()).log(
 		Level.WARNING, message);
@@ -240,7 +242,6 @@
 	    int i = 0;
 	    String line;
 
-	    // Read login history
 	    while ((line = reader.readLine()) != null && i++ < loginSize) {
 		String[] fields = line.split(LOGIN_DELIMITER);
 
@@ -269,7 +270,7 @@
 	    }
 	    reader.close();
 	} catch (IOException e) {
-	    String message = "Cannot obtain login history";
+	    String message = "error reading login history";
 	    Logger.getLogger(getClass().getName()).log(
 		Level.WARNING, message, e);
 	}