commit 62e255f517971eca48b7058e5f03de717077e793
author Karl Pauls <karlpauls@gmail.com> Wed Jun 26 11:46:40 2019 +0200
committer Karl Pauls <karlpauls@gmail.com> Wed Jun 26 11:46:40 2019 +0200
tree a54354f3aeb40efd89011d641d2abe0c5a681be6
parent 417aa895ed7702d8dbdb8e62333a6251a22fecce

SLING-8535: make register privilege work when privilege already exists.

src/main/java/org/apache/sling/jcr/repoinit/impl/PrivilegeVisitor.java

diff --git a/src/main/java/org/apache/sling/jcr/repoinit/impl/PrivilegeVisitor.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/PrivilegeVisitor.java
index ecbb0d6..a86fc7a 100644
--- a/src/main/java/org/apache/sling/jcr/repoinit/impl/PrivilegeVisitor.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/PrivilegeVisitor.java
@@ -21,6 +21,8 @@
 import org.apache.sling.repoinit.parser.operations.RegisterPrivilege;
 
 import javax.jcr.Session;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
 
 public class PrivilegeVisitor extends DoNothingVisitor {
     public PrivilegeVisitor(Session session) {
@@ -30,10 +32,19 @@
     @Override
     public void visitRegisterPrivilege(RegisterPrivilege rp) {
         try {
-            ((JackrabbitWorkspace) session.getWorkspace()).getPrivilegeManager()
-                    .registerPrivilege(rp.getPrivilegeName(), rp.isAbstract(), rp.getDeclaredAggregateNames().toArray(new String[0]));
+            Privilege priv = ((JackrabbitWorkspace) session.getWorkspace()).getPrivilegeManager().getPrivilege(rp.getPrivilegeName());
+            log.info("Privilege {} already exists: {}, no changes made.", rp.getPrivilegeName(), priv);
         } catch (Exception e) {
-            report(e, "Unable to register privilege from: " + rp);
+            if (e instanceof AccessControlException) {
+                try {
+                    ((JackrabbitWorkspace) session.getWorkspace()).getPrivilegeManager()
+                        .registerPrivilege(rp.getPrivilegeName(), rp.isAbstract(), rp.getDeclaredAggregateNames().toArray(new String[0]));
+                } catch (Exception ex) {
+                    report(ex, "Unable to register privilege from: " + rp);
+                }
+            } else {
+                report(e, "Unable to register privilege from: " + rp);
+            }
         }
     }
 }