X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fproxy%2FAbstractUrlProxy.java;h=e088e1f0c4c6b88d3e9877f4f1b09bcfdc520415;hb=ec9049940b98397b0df2f70b6c953aa226323c59;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..e088e1f0c 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,21 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.proxy;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
@@ -89,15 +105,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());