You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2016/10/25 13:57:12 UTC
[2/3] archiva-redback-core git commit: Add exception handler
Add exception handler
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/b6a3d013
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/b6a3d013
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/b6a3d013
Branch: refs/heads/jpa
Commit: b6a3d0136023e2760356c642bf1d04a7f5df0abc
Parents: 45b429e
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Oct 25 15:53:59 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Oct 25 15:53:59 2016 +0200
----------------------------------------------------------------------
.../archiva/redback/rbac/jpa/JpaRbacManager.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/b6a3d013/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
index 8689566..ea219e9 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
@@ -373,10 +373,18 @@ public class JpaRbacManager extends AbstractRBACManager {
@Override
public List<UserAssignment> getUserAssignmentsForRoles(Collection<String> roleNames) throws RbacManagerException {
- final EntityManager em = getEm();
- Query q = em.createQuery("SELECT ua FROM JpaUserAssignment ua, ua.roleNames rn WHERE rn IN :rolenames");
- q.setParameter("rolenames",roleNames);
- return q.getResultList();
+ try {
+ final EntityManager em = getEm();
+ Query q = em.createQuery("SELECT ua FROM JpaUserAssignment ua WHERE ua.roleNames IN :roles");
+ q.setParameter("roles", roleNames);
+ return q.getResultList();
+ } catch (Exception ex) {
+ log.error("Query failed: {}",ex.getMessage(),ex);
+ if (log.isDebugEnabled()) {
+ ex.printStackTrace();
+ }
+ throw new RbacManagerException(ex.getMessage(),ex);
+ }
}
@Transactional