From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 8 Dec 2012 14:10:32 +0000 (+0000)
Subject: Fix NPE when TRACE logging is activated
X-Git-Tag: argeo-commons-2.1.30~720
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0b2d4747191bd907c8911d058263fa962cef6a6c;p=lgpl%2Fargeo-commons.git

Fix NPE when TRACE logging is activated

git-svn-id: https://svn.argeo.org/commons/trunk@5919 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
index a6c50862d..14b6e9989 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
@@ -24,6 +24,10 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.springframework.web.servlet.DispatcherServlet;
 
+/**
+ * Overrides Spring {@link DispatcherServlet}, see
+ * http://forum.springsource.org/showthread.php?t=53472.
+ */
 public class ExtendedDispatcherServlet extends DispatcherServlet {
 	private static final long serialVersionUID = -5584673209855752009L;
 
@@ -33,23 +37,17 @@ public class ExtendedDispatcherServlet extends DispatcherServlet {
 	protected void service(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException,
 			java.io.IOException {
-
-		// see http://forum.springsource.org/showthread.php?t=53472
 		try {
 			if (log.isTraceEnabled()) {
-				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"));
+				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"));
 			}
 			doService(request, response);
 		} catch (Exception e) {
-			// e.printStackTrace();
-			// log.debug(request.getMethod());
 			throw new ArgeoException("Cannot process request", e);
 		}
 	}