Fix logging level when a well known user state bug manifests itself.studio_1.0.1studio_1.0.0gradle_1.0.1gradle_1.0.0-rc4gradle_1.0.0-rc3gradle_1.0.0-rc2gradle_1.0.0-rc1gradle_1.0.0gradle_0.14.4gradle_0.14.3studio-1.0-release

There is an issue in the Login plugin that allows the state of the user store to 
become inconsistent. The active user can be set while there are no logged in
users.  I've been messing around with a rather large CL to fix this issue, but I don't 
want to commit it to 1.0 since it's too risky.  This CL will make sure
that the end user doesn't get error notifications when this happens.

Change-Id: Ia953e31c584b2399b57ff3d06809506440985e05

1 files changed, 2 insertions, 10 deletions

diff --git a/src/com/google/gct/login/GoogleLogin.java b/src/com/google/gct/login/GoogleLogin.java
index f598af4..0e77b59 100644
--- a/src/com/google/gct/login/GoogleLogin.java
+++ b/src/com/google/gct/login/GoogleLogin.java
@@ -23,12 +23,7 @@ import com.google.api.client.http.HttpRequestFactory;
 import com.google.common.base.Strings;
 import com.google.gct.login.ui.GoogleLoginActionButton;
 import com.google.gct.login.ui.GoogleLoginCopyAndPasteDialog;
-import com.google.gdt.eclipse.login.common.GoogleLoginState;
-import com.google.gdt.eclipse.login.common.LoggerFacade;
-import com.google.gdt.eclipse.login.common.OAuthData;
-import com.google.gdt.eclipse.login.common.OAuthDataStore;
-import com.google.gdt.eclipse.login.common.UiFacade;
-import com.google.gdt.eclipse.login.common.VerificationCodeHolder;
+import com.google.gdt.eclipse.login.common.*;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -41,8 +36,6 @@ import com.intellij.openapi.progress.util.ProgressIndicatorBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
 import icons.GoogleLoginIcons;
@@ -50,7 +43,6 @@ import net.jcip.annotations.Immutable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.Icon;
 import java.awt.*;
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -735,7 +727,7 @@ public class GoogleLogin {
         try {
           users.setActiveUser(activeUserString);
         } catch (IllegalArgumentException ex) {
-          LOG.error("Error while initiating users", ex);
+          LOG.warn("Error while initiating users", ex);
           // Set no active user
           users.removeActiveUser();
         }