From e444d5d2758af37a8a4df79c60c01f3be493ed26 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 29 Aug 2012 09:32:13 +0200 Subject: [PATCH] improve constructor of repository permission --- .../sonia/scm/security/RepositoryPermission.java | 14 ++++++++++++++ .../src/main/java/sonia/scm/security/ScmRealm.java | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermission.java b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermission.java index c4e8916d57..fc82ed82a8 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermission.java +++ b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermission.java @@ -38,6 +38,7 @@ import com.google.common.base.Objects; import org.apache.shiro.authz.Permission; import sonia.scm.repository.PermissionType; +import sonia.scm.repository.Repository; //~--- JDK imports ------------------------------------------------------------ @@ -55,6 +56,19 @@ public class RepositoryPermission implements Permission, Serializable //~--- constructors --------------------------------------------------------- + /** + * Constructs ... + * + * + * @param repository + * @param permissionType + */ + public RepositoryPermission(Repository repository, + PermissionType permissionType) + { + this(repository.getId(), permissionType); + } + /** * Constructs ... * diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java index 3e7724cd2f..ea636e4fdd 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java +++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java @@ -479,8 +479,8 @@ public class ScmRealm extends AuthorizingRealm permission.getName())) || ((!permission.isGroupPermission()) && user.getName().equals(permission.getName()))) { - RepositoryPermission rp = - new RepositoryPermission(repository.getId(), permission.getType()); + RepositoryPermission rp = new RepositoryPermission(repository, + permission.getType()); if (logger.isTraceEnabled()) {