Handle NotSignedIn errors gracefully during module load

If we get back a NotSignedIn exception we should whack the cookie
that lead us to believe we might be signed in, and not log error.
This fix really only matters in the hosted debug console, where
the error is somewhat common if you reinitialize your data store.

Signed-off-by: Shawn O. Pearce <sop@google.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/webapp/src/com/google/gerrit/client/Gerrit.java b/webapp/src/com/google/gerrit/client/Gerrit.java
index e8be073c0f..98a7f3cfee 100644
--- a/webapp/src/com/google/gerrit/client/Gerrit.java
+++ b/webapp/src/com/google/gerrit/client/Gerrit.java
@@ -194,7 +194,10 @@ public class Gerrit implements EntryPoint {
             }
 
             public void onFailure(final Throwable caught) {
-              GWT.log("Unexpected failure from validating account", caught);
+              if (!GWT.isScript() && !GerritCallback.isNotSignedIn(caught)) {
+                GWT.log("Unexpected failure from validating account", caught);
+              }
+              Cookies.removeCookie(ACCOUNT_COOKIE);
               refreshMenuBar();
               showInitialScreen();
             }
diff --git a/webapp/src/com/google/gerrit/client/rpc/GerritCallback.java b/webapp/src/com/google/gerrit/client/rpc/GerritCallback.java
index 45af9eab23..603b745f42 100644
--- a/webapp/src/com/google/gerrit/client/rpc/GerritCallback.java
+++ b/webapp/src/com/google/gerrit/client/rpc/GerritCallback.java
@@ -39,7 +39,7 @@ public abstract class GerritCallback<T> implements AsyncCallback<T> {
     }
   }
 
-  private static boolean isNotSignedIn(final Throwable caught) {
+  public static boolean isNotSignedIn(final Throwable caught) {
     if (caught instanceof NotSignedInException) {
       return true;
     }
@@ -47,7 +47,7 @@ public abstract class GerritCallback<T> implements AsyncCallback<T> {
         && caught.getMessage().equals(NotSignedInException.MESSAGE);
   }
 
-  protected static boolean isNoSuchEntity(final Throwable caught) {
+  public static boolean isNoSuchEntity(final Throwable caught) {
     if (caught instanceof NoSuchEntityException) {
       return true;
     }