X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fmvc%2FResourceProxyServlet.java;h=c2e56379efdb94aae557338c580e18f3957eb14d;hb=615bcb2bf7937888af7631cb3319d8c55b275fa9;hp=8735e869e27f600d78b320821d3ba86fb199a65b;hpb=2d4dd736ab07b1ef3aaec0a9e5d29f30c551de9c;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java
index 8735e869e..c2e56379e 100644
--- a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java
+++ b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java
@@ -1,3 +1,18 @@
+/*
+ * 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.mvc;
 
 import java.io.IOException;
@@ -5,6 +20,7 @@ import java.io.InputStream;
 
 import javax.jcr.Binary;
 import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.Session;
 import javax.servlet.ServletException;
@@ -17,12 +33,11 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.proxy.ResourceProxy;
 
 /** Wraps a proxy via HTTP */
-public class ResourceProxyServlet extends HttpServlet implements ArgeoNames {
+public class ResourceProxyServlet extends HttpServlet {
 	private static final long serialVersionUID = -8886549549223155801L;
 
 	private final static Log log = LogFactory
@@ -39,8 +54,16 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames {
 		String path = request.getPathInfo();
 
 		String nodePath = proxy.getNodePath(path);
-		if (log.isTraceEnabled())
+		if (log.isTraceEnabled()) {
 			log.trace("path=" + path + ", nodePath=" + nodePath);
+			log.trace("UserPrincipal = " + request.getUserPrincipal().getName());
+			log.trace("SessionID = " + request.getSession().getId());
+			log.trace("ContextPath = " + request.getContextPath());
+			log.trace("ServletPath = " + request.getServletPath());
+			log.trace("PathInfo = " + request.getPathInfo());
+			log.trace("Method = " + request.getMethod());
+			log.trace("User-Agent = " + request.getHeader("User-Agent"));
+		}
 
 		Node node = proxy.proxy(jcrSession, path);
 		if (node == null)
@@ -82,8 +105,13 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames {
 
 			response.setContentType(contentType);
 
-			binary = node.getNode(Property.JCR_CONTENT)
-					.getProperty(Property.JCR_DATA).getBinary();
+			try {
+				binary = node.getNode(Property.JCR_CONTENT)
+						.getProperty(Property.JCR_DATA).getBinary();
+			} catch (PathNotFoundException e) {
+				log.error("Node " + node + " as no data under content");
+				throw e;
+			}
 			in = binary.getStream();
 			IOUtils.copy(in, response.getOutputStream());
 		} catch (Exception e) {