From ef6899c2c76a1c74f7821a8a7a5f2806cc90d1b9 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 10 Jan 2011 13:20:30 +0000 Subject: [PATCH] 332517 Improved DefaultServlet debug git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2637 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 9 +++++---- .../java/org/eclipse/jetty/servlet/DefaultServlet.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 5ca213d65b9..a1c6d97b21d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,14 +1,15 @@ jetty-7.3.0-SNAPSHOT + + 320457 add SPNEGO support + 324505 Implement API login - + 333247 fix api compat issue in ConstraintSecurityHandler - + 332799 100% CPU on redeploy session invalidation - + 332432 Scanner.java now always scanning the canonical form of File + 332179 Fixed formatting of negative dates + + 332432 Scanner.java now always scanning the canonical form of File + + 332517 Improved DefaultServlet debug + 332703 Cleanup context scope JNDI at stop + 332796 Annotations inheritance does not work with jetty7 + + 332799 100% CPU on redeploy session invalidation + 332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI - + 320457 add SPNEGO support + + 333247 fix api compat issue in ConstraintSecurityHandler + 333481 Handle UTF-32 codepoints + 333608 tlds defined in web.xml are not picked up + 333679 Refactored jetty-jmx. Moved mbeans to modules. diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 6896f57843b..727883106ea 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -442,8 +442,8 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory } if (Log.isDebugEnabled()) - Log.debug("resource="+resource+(content!=null?" content":"")); - + Log.debug("uri="+request.getRequestURI()+" resource="+resource+(content!=null?" content":"")); + // Handle resource if (resource==null || !resource.exists()) {