From 1ac71de645c5ba3013bfae1f9f8d3a7c0e571d76 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 18 Jan 2012 07:41:16 +1100 Subject: [PATCH] 368632 Remove superfluous removal of org.apache.catalina.jsp_file --- .../src/main/java/org/eclipse/jetty/server/Dispatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java index 99c9ec33127..1102b491c8f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java @@ -131,7 +131,7 @@ public class Dispatcher implements RequestDispatcher public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { Request baseRequest=(request instanceof Request)?((Request)request):AbstractHttpConnection.getCurrentConnection().getRequest(); - request.removeAttribute(__JSP_FILE); // TODO remove when glassfish 1044 is fixed + if (!(request instanceof HttpServletRequest)) request = new ServletRequestHttpWrapper(request); @@ -215,7 +215,7 @@ public class Dispatcher implements RequestDispatcher Response base_response=baseRequest.getResponse(); response.resetBuffer(); base_response.fwdReset(); - request.removeAttribute(__JSP_FILE); // TODO remove when glassfish 1044 is fixed + if (!(request instanceof HttpServletRequest)) request = new ServletRequestHttpWrapper(request);