opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  ForcePushIT#deleteAllowedWithDeletePermission: Fix permission setting
  PermissionBackend#filter: Don't fail if project doesn't exist
  Reload actions when new change is loaded, not on new changeNum
  Fix lint errors
  Filter out changes for vanished projects
  Propagate cause of a project not found in cache

Change-Id: I595235f32993802bfc1f27034734abdd4508ce91
This commit is contained in:
Luca Milanesio
2018-04-24 10:18:37 +01:00
parent bdb1213b37 f90efd8cf0
commit 4bc31b3206
7 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java
View File

@@ -32,13 +32,11 @@ import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PeerDaemonUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.cache.PerThreadCache;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
@@ -108,16 +106,15 @@ public class DefaultPermissionBackend extends PermissionBackend {
public ForProject project(Project.NameKey project) {
try {
ProjectState state = projectCache.checkedGet(project);
if (state != null) {
ProjectControl control =
PerThreadCache.getOrCompute(
PerThreadCache.Key.create(ProjectControl.class, project, user.getCacheKey()),
() -> projectControlFactory.create(user, state));
return control.asForProject().database(db);
}
return FailedPermissionBackend.project("not found", new NoSuchProjectException(project));
} catch (IOException e) {
return FailedPermissionBackend.project("unavailable", e);
ProjectControl control =
PerThreadCache.getOrCompute(
PerThreadCache.Key.create(ProjectControl.class, project, user.getCacheKey()),
() -> projectControlFactory.create(user, state));
return control.asForProject().database(db);
} catch (Exception e) {
Throwable cause = e.getCause() != null ? e.getCause() : e;
return FailedPermissionBackend.project(
"project '" + project.get() + "' is unavailable", cause);
}
}