From ce69fd986d0476db368504b015f9c341ea4b4423 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 13 Dec 2013 12:17:29 +0000 Subject: [PATCH] the cause can be not found git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1550703 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/redback/rbac/AbstractRBACManager.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java index db65d887..4678a7f5 100644 --- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java +++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java @@ -157,9 +157,8 @@ public abstract class AbstractRBACManager } catch ( Exception e ) { - log.warn( - "Unable to trigger .rbacUserAssignmentSaved( UserAssignment ) to {}", listener.getClass().getName(), - e ); + log.warn( "Unable to trigger .rbacUserAssignmentSaved( UserAssignment ) to {}", + listener.getClass().getName(), e ); } } } @@ -175,7 +174,7 @@ public abstract class AbstractRBACManager catch ( Exception e ) { log.warn( "Unable to trigger .rbacUserAssignmentRemoved( UserAssignment ) to {}", - listener.getClass().getName(), e ); + listener.getClass().getName(), e ); } } } @@ -741,6 +740,14 @@ public abstract class AbstractRBACManager //it.remove(); childRoleNamesUpdated = true; } + catch ( RbacManagerException e ) + { + if ( !( e.getCause() instanceof RbacObjectNotFoundException ) ) + { + throw e; + } + childRoleNamesUpdated = true; + } } if ( childRoleNamesUpdated )