commit 42861a8a47d1e3c6fd157210d96e664020bf83eb
author Dave Borowitz <dborowitz@google.com> Wed Nov 04 15:39:46 2015 -0500
committer Dave Borowitz <dborowitz@google.com> Wed Nov 04 15:39:46 2015 -0500
tree 71922767105e49583d094d2bfd31024028ec0e11
parent bea876e4e94e1409a5249e3eec02435bff877eb1

Handle null from Gerrit#getDiffPreferences()

Change-Id: Ib6500a1cf55e799b5375ec8e92d82354799fafe5

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
index 07d45e9..b1f05f8 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
@@ -21,6 +21,9 @@
 
 public class DiffPreferences extends JavaScriptObject {
   public static DiffPreferences create(DiffPreferencesInfo in) {
+    if (in == null) {
+      in = DiffPreferencesInfo.defaults();
+    }
     DiffPreferences p = createObject().cast();
     p.ignoreWhitespace(in.ignoreWhitespace);
     p.tabSize(in.tabSize);

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
index a50768d..455a643 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
@@ -503,7 +503,7 @@
     AccountApi.putDiffPreferences(prefs, new GerritCallback<DiffPreferences>() {
       @Override
       public void onSuccess(DiffPreferences result) {
-        DiffPreferencesInfo p = Gerrit.getDiffPreferences();
+        DiffPreferencesInfo p = new DiffPreferencesInfo();
         result.copyTo(p);
         Gerrit.setDiffPreferences(p);
       }