Refactor JCR exceptions.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / JcrAuthorizations.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
index 381a051fb1d8d434b8bab9f7095729148064218f..351929f8da176b2e607b9d829af67a9d138ccbf9 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
@@ -50,9 +50,9 @@ public class JcrAuthorizations implements Runnable {
                                session = repository.login(workspace);
                                initAuthorizations(session);
                        }
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
-                       throw new ArgeoJcrException(
+                       throw new JcrException(
                                        "Cannot set authorizations " + principalPrivileges + " on workspace " + currentWorkspace, e);
                } finally {
                        JcrUtils.logoutQuietly(session);
@@ -64,9 +64,9 @@ public class JcrAuthorizations implements Runnable {
                try {
                        session = repository.login(workspace);
                        initAuthorizations(session);
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
-                       throw new ArgeoJcrException(
+                       throw new JcrException(
                                        "Cannot set authorizations " + principalPrivileges + " on repository " + repository, e);
                } finally {
                        JcrUtils.logoutQuietly(session);
@@ -86,7 +86,7 @@ public class JcrAuthorizations implements Runnable {
                        String path = null;
                        int slashIndex = privileges.indexOf('/');
                        if (slashIndex == 0) {
-                               throw new ArgeoJcrException("Privilege " + privileges + " badly formatted it starts with /");
+                               throw new IllegalArgumentException("Privilege " + privileges + " badly formatted it starts with /");
                        } else if (slashIndex > 0) {
                                path = privileges.substring(slashIndex);
                                privileges = privileges.substring(0, slashIndex);