summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Flynn <paflynn@google.com>2014-11-18 21:02:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-18 21:02:53 +0000
commitc6a8a67607e08628eab04b6cbb0c0f8572b7b317 (patch)
tree5b5d41a79d0b1caab1c9c91d71c60b5667cddba5
parent73d50b00e11d153968a6e44372ea403e9471c133 (diff)
parentb2250fe6b65c77ba4510fabe472fd88c025eb855 (diff)
downloadlogin-c6a8a67607e08628eab04b6cbb0c0f8572b7b317.tar.gz
Fix logging level when a well known user state bug manifests itself.
automerge: b2250fe * commit 'b2250fe6b65c77ba4510fabe472fd88c025eb855': Fix logging level when a well known user state bug manifests itself.
-rw-r--r--src/com/google/gct/login/GoogleLogin.java12
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 483545f..92c7813 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;
@@ -42,8 +37,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;
@@ -51,7 +44,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;
@@ -736,7 +728,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();
}