X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fmvc%2FResourceProxyServlet.java;h=b92f776cd23bd2a83645281614ac1ac00d04d1dd;hb=22365726e2fdcb12e76c3d78060960ae7161628e;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..b92f776cd 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
@@ -5,6 +5,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;
@@ -39,8 +40,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 +91,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) {