aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java15
1 files 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 db65d887c..4678a7f50 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 )