commit 6052869baf16f82b26f70bac826e823136dca30a
author Shawn O. Pearce <sop@google.com> Mon May 18 09:48:51 2009 -0700
committer Shawn O. Pearce <sop@google.com> Mon May 18 10:16:59 2009 -0700
tree 21dfbcf9a0513efa10b4b3f31cf5109bd1472fd3
parent fb6310e5d1d899b4458f5db928fa4f9f400b1773

Minor cleanup to Gerrit module bootstrap code path

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

src/main/java/com/google/gerrit/client/Gerrit.java

diff --git a/src/main/java/com/google/gerrit/client/Gerrit.java b/src/main/java/com/google/gerrit/client/Gerrit.java
index 3ae578a..544e958 100644
--- a/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -291,26 +291,23 @@
               } else {
                 Cookies.removeCookie(ACCOUNT_COOKIE);
               }
-              refreshMenuBar();
-              showInitialScreen();
+              onModuleLoad3();
             }
 
             public void onFailure(final Throwable caught) {
-              if (!GWT.isScript() && !GerritCallback.isNotSignedIn(caught)) {
-                GWT.log("Unexpected failure from validating account", caught);
-              }
+              GWT.log("Unexpected failure from validating account", caught);
               Cookies.removeCookie(ACCOUNT_COOKIE);
-              refreshMenuBar();
-              showInitialScreen();
+              onModuleLoad3();
             }
           });
     } else {
-      refreshMenuBar();
-      showInitialScreen();
+      onModuleLoad3();
     }
   }
 
-  private void showInitialScreen() {
+  private void onModuleLoad3() {
+    refreshMenuBar();
+
     final RootPanel sg = RootPanel.get("gerrit_startinggerrit");
     sg.getElement().getParentElement().removeChild(sg.getElement());
     RootPanel.detachNow(sg);