commit 0bded01c6c652dc092cc175a88e1895e4a87d371
author David Pursehouse <dpursehouse@collab.net> Fri Aug 03 14:56:01 2018 +0100
committer David Pursehouse <dpursehouse@collab.net> Tue Aug 07 21:14:12 2018 +0100
tree 3ff1c6cb7f2fbcb73e144e706bba129f52a9958a
parent 0e02a5adc90cfa414accc2cea018d1d7da23b5b0

PutConfig: Reload project config before returning response

The response returned after updating the configuration was generated
using the configuration that was loaded before the update, and did
not contain the changed values.

Change-Id: I70fe53859e6cd2be478f9d72f29f49e9b6b97046

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
index e8c1f06..272e2c5 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
@@ -153,15 +153,15 @@
     ConfigInput input = new ConfigInput();
     input.maxObjectSizeLimit = "100k";
     ConfigInfo info = setConfig(input);
-    assertThat(info.maxObjectSizeLimit.value).isNull(); // TODO: Should be "100k"
+    assertThat(info.maxObjectSizeLimit.value).isEqualTo("100k");
     assertThat(info.maxObjectSizeLimit.configuredValue).isEqualTo("100k");
     assertThat(info.maxObjectSizeLimit.inheritedValue).isNull();
 
     // Clear the value
     input.maxObjectSizeLimit = "0";
     info = setConfig(input);
-    assertThat(info.maxObjectSizeLimit.value).isEqualTo("0"); // TODO: Should be null
-    assertThat(info.maxObjectSizeLimit.configuredValue).isEqualTo("0"); // TODO: Should be null
+    assertThat(info.maxObjectSizeLimit.value).isNull();
+    assertThat(info.maxObjectSizeLimit.configuredValue).isNull();
     assertThat(info.maxObjectSizeLimit.inheritedValue).isNull();
   }
 
@@ -196,7 +196,7 @@
     ConfigInput input = new ConfigInput();
     input.maxObjectSizeLimit = "100k";
     ConfigInfo info = setConfig(input);
-    assertThat(info.maxObjectSizeLimit.value).isEqualTo("200k"); // TODO: Should be "100k"
+    assertThat(info.maxObjectSizeLimit.value).isEqualTo("100k");
     assertThat(info.maxObjectSizeLimit.configuredValue).isEqualTo("100k");
     assertThat(info.maxObjectSizeLimit.inheritedValue).isEqualTo("200k");
   }

gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
index a7e6d10..e0fff4d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
@@ -172,7 +172,7 @@
         throw new ResourceConflictException("Cannot update " + projectName, e);
       }
 
-      ProjectState state = projectStateFactory.create(projectConfig);
+      ProjectState state = projectStateFactory.create(ProjectConfig.read(md));
       return new ConfigInfoImpl(
           serverEnableSignedPush,
           state.controlFor(user.get()),