commit df308aa46cf18e603b6f2a01d506c8927af8b433
author Shawn Pearce <sop@google.com> Wed Oct 16 18:32:57 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 18:32:57 2013 +0000
tree a257da73ba448438ba4e6652aaf3c738e01aa2d3
parent 98aa6d3825fef67c66c8337d1b46137fe405f70b
parent bb23f0fe3f1b4ed449221d5f9e1a8c31c9bf241d

Merge "Fix updating of project options"

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 1918a03..f105087 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
@@ -139,8 +139,10 @@
           throw new ResourceConflictException("Cannot update " + projectName);
         }
       }
-      return new ConfigInfo(rsrc.getControl(),
-          projectStateFactory.create(projectConfig),
+
+      ProjectState state = projectStateFactory.create(projectConfig);
+      return new ConfigInfo(
+          state.controlFor(currentUser.get()), state,
           config, views, currentUser);
     } catch (ConfigInvalidException err) {
       throw new ResourceConflictException("Cannot read project " + projectName, err);