X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fproxy%2FAbstractUrlProxy.java;h=7f1788427b36ac2d118df005d0922137cda660f5;hb=fd4d04608728c25a4f625d268a12ed87881dd600;hp=357ec1f37262aa0a847fcdc41309314d43b90453;hpb=22365726e2fdcb12e76c3d78060960ae7161628e;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java index 357ec1f37..7f1788427 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java @@ -1,5 +1,6 @@ package org.argeo.jcr.proxy; +import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -89,15 +90,19 @@ public abstract class AbstractUrlProxy implements ResourceProxy { } /** Session is not saved */ - protected Node proxyUrl(Session session, String baseUrl, String path) { + protected Node proxyUrl(Session session, String baseUrl, String path) + throws RepositoryException { + String nodePath = getNodePath(path); + if (jcrAdminSession.itemExists(nodePath)) + throw new ArgeoException("Node " + nodePath + " already exists"); Node node = null; String remoteUrl = baseUrl + path; InputStream in = null; try { URL u = new URL(remoteUrl); in = u.openStream(); - node = importFile(session, getNodePath(path), in); - } catch (Exception e) { + node = importFile(session, nodePath, in); + } catch (IOException e) { if (log.isTraceEnabled()) { log.trace("Cannot read " + remoteUrl + ", skipping... " + e.getMessage());