You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/12/13 13:17:29 UTC

svn commit: r1550703 - /archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java

Author: olamy
Date: Fri Dec 13 12:17:29 2013
New Revision: 1550703

URL: http://svn.apache.org/r1550703
Log:
the cause can be not found

Modified:
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1550703&r1=1550702&r2=1550703&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java Fri Dec 13 12:17:29 2013
@@ -157,9 +157,8 @@ public abstract class AbstractRBACManage
             }
             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 AbstractRBACManage
             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 AbstractRBACManage
                 //it.remove();
                 childRoleNamesUpdated = true;
             }
+            catch ( RbacManagerException e )
+            {
+                if ( !( e.getCause() instanceof RbacObjectNotFoundException ) )
+                {
+                    throw e;
+                }
+                childRoleNamesUpdated = true;
+            }
         }
 
         if ( childRoleNamesUpdated )