opendev/gerrit
Code Issues Proposed changes

Merge "Fix wrong date/time for commits in refs/meta/config branch" into stable-2.11

Browse Source
This commit is contained in:
Edwin Kempin 2015-07-03 08:14:13 +00:00 committed by Gerrit Code Review
commit 5fcb31176e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
public Map<String, Map<String, ConfigValue>> pluginConfigValues; public Map<String, Map<String, ConfigValue>> pluginConfigValues;
} }
private final MetaDataUpdate.User metaDataUpdateFactory; private final Provider<MetaDataUpdate.User> metaDataUpdateFactory;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final GitRepositoryManager gitMgr; private final GitRepositoryManager gitMgr;
private final ProjectState.Factory projectStateFactory; private final ProjectState.Factory projectStateFactory;
@ -87,7 +87,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
private final ChangeHooks hooks; private final ChangeHooks hooks;
@Inject @Inject
PutConfig(MetaDataUpdate.User metaDataUpdateFactory, PutConfig(Provider<MetaDataUpdate.User> metaDataUpdateFactory,
ProjectCache projectCache, ProjectCache projectCache,
GitRepositoryManager gitMgr, GitRepositoryManager gitMgr,
ProjectState.Factory projectStateFactory, ProjectState.Factory projectStateFactory,
@ -131,7 +131,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
final MetaDataUpdate md; final MetaDataUpdate md;
try { try {
md = metaDataUpdateFactory.create(projectName); md = metaDataUpdateFactory.get().create(projectName);
} catch (RepositoryNotFoundException notFound) { } catch (RepositoryNotFoundException notFound) {
throw new ResourceNotFoundException(projectName.get()); throw new ResourceNotFoundException(projectName.get());
} catch (IOException e) { } catch (IOException e) {