Fix NPE when site header or footer isn't present

If there is no site header or footer, HostPageServlet deletes
these from the document it sends to the browser, which means we
have no DOM handle to the node.  We can't set visiblity on null,
so skip the set call.

Bug: issue 587
Change-Id: I6e16472f35b99f18fea4eead9cd1029e87b4b1f2
Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index 9249f5e2d4..641db80b3a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -479,8 +479,12 @@ public class Gerrit implements EntryPoint {
     if (myAccount != null) {
       final AccountGeneralPreferences p = myAccount.getGeneralPreferences();
       CopyableLabel.setFlashEnabled(p.isUseFlashClipboard());
-      siteHeader.setVisible(p.isShowSiteHeader());
-      siteFooter.setVisible(p.isShowSiteHeader());
+      if (siteHeader != null) {
+        siteHeader.setVisible(p.isShowSiteHeader());
+      }
+      if (siteFooter != null) {
+        siteFooter.setVisible(p.isShowSiteHeader());
+      }
     }
   }