X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2Fproxy%2FAbstractUrlProxy.java;h=f0e8605c403a0472cba81d889e55efbccdf7463e;hb=215480a865603e0090c43114541441ac1586b379;hp=f1d0285695ff8e56e8621eca396d347c85a6944d;hpb=afd31256550ee8fe257a43558cfd07dfcf2e5c04;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java b/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java index f1d028569..f0e8605c4 100644 --- a/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java +++ b/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java @@ -14,7 +14,7 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.jcr.ArgeoJcrException; +import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; /** Base class for URL based proxys. */ @@ -33,9 +33,9 @@ public abstract class AbstractUrlProxy implements ResourceProxy { beforeInitSessionSave(jcrAdminSession); if (jcrAdminSession.hasPendingChanges()) jcrAdminSession.save(); - } catch (Exception e) { + } catch (RepositoryException e) { JcrUtils.discardQuietly(jcrAdminSession); - throw new ArgeoJcrException("Cannot initialize Maven proxy", e); + throw new JcrException("Cannot initialize URL proxy", e); } } @@ -73,7 +73,7 @@ public abstract class AbstractUrlProxy implements ResourceProxy { nodeClient = clientSession.getNode(path); return nodeClient; } catch (RepositoryException e) { - throw new ArgeoJcrException("Cannot proxy " + path, e); + throw new JcrException("Cannot proxy " + path, e); } finally { if (nodeClient == null) JcrUtils.logoutQuietly(clientSession); @@ -89,7 +89,7 @@ public abstract class AbstractUrlProxy implements ResourceProxy { return node; } catch (RepositoryException e) { JcrUtils.discardQuietly(jcrAdminSession); - throw new ArgeoJcrException("Cannot retrieve and save " + path, e); + throw new JcrException("Cannot retrieve and save " + path, e); } finally { notifyAll(); }