17367 - warning should not be issued if history file doesn't exist
authorDan Labrecque <Dan.Labrecque@oracle.com>
Tue, 09 Nov 2010 10:29:22 -0500
changeset 599 cb942db607b7
parent 598 90e364205db8
child 600 c16a7e34499d
17367 - warning should not be issued if history file doesn't exist
usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/AppLoginHistory.java
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/AppLoginHistory.java	Fri Nov 05 15:51:25 2010 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/AppLoginHistory.java	Tue Nov 09 10:29:22 2010 -0500
@@ -194,7 +194,7 @@
     // Read persistent login history.
     private void readLogins() {
 	// Ensure file exists.
-	if (!loginFile.canRead()) {
+	if (loginFile.exists() && !loginFile.canRead()) {
 	    String message = "Cannot read login history: " +
 		loginFile.getAbsolutePath();
 	    Logger.getLogger(getClass().getName()).log(
@@ -251,14 +251,12 @@
 	File loginDir = loginFile.getParentFile();
 
 	// Ensure directory exists.
-	if (!loginDir.exists()) {
-	    if (!loginDir.mkdirs()) {
-		String message = "Cannot create login history directory: " +
-		    loginDir.getAbsolutePath();
-		Logger.getLogger(getClass().getName()).log(
-		    Level.WARNING, message);
-		return;
-	    }
+	if (!loginDir.exists() && !loginDir.mkdirs()) {
+	    String message = "Cannot create login history directory: " +
+		loginDir.getAbsolutePath();
+	    Logger.getLogger(getClass().getName()).log(
+		Level.WARNING, message);
+	    return;
 	}
 
 	try {