aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-12-13 12:17:29 +0000
committerOlivier Lamy <olamy@apache.org>2013-12-13 12:17:29 +0000
commitce69fd986d0476db368504b015f9c341ea4b4423 (patch)
tree577ae172aaefdbb6070f0cd9402587f95fb7b4b8
parentc9314cb5e7cfe78dcd576c24e29ee2146ff7d59a (diff)
downloadarchiva-ce69fd986d0476db368504b015f9c341ea4b4423.tar.gz
archiva-ce69fd986d0476db368504b015f9c341ea4b4423.zip
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
-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 )