You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/12/20 16:49:32 UTC

svn commit: r605970 - /incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java

Author: fmeschbe
Date: Thu Dec 20 07:49:32 2007
New Revision: 605970

URL: http://svn.apache.org/viewvc?rev=605970&view=rev
Log:
SLING-140 Replace clientRequest and clientResponse references with
Sling request and response objects to enable proper error handling

Modified:
    incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java

Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java?rev=605970&r1=605969&r2=605970&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java Thu Dec 20 07:49:32 2007
@@ -175,19 +175,19 @@
                 // prepare internal request stuff
                 requestData = new RequestData(this, session, clientRequest,
                     clientResponse);
-                SlingHttpServletRequest request = requestData.getSlingRequest();
-                SlingHttpServletResponse response = requestData.getSlingResponse();
+                clientRequest = requestData.getSlingRequest();
+                clientResponse = requestData.getSlingResponse();
 
                 Filter[] filters = requestFilterChain.getFilters();
                 if (filters != null) {
                     FilterChain processor = new RequestSlingFilterChain(this,
                         filters);
 
-                    processor.doFilter(request, response);
+                    processor.doFilter(clientRequest, clientResponse);
 
                 } else {
                     log.error("service: No Request Handling filters, cannot process request");
-                    response.sendError(SC_INTERNAL_SERVER_ERROR,
+                    clientResponse.sendError(SC_INTERNAL_SERVER_ERROR,
                         "Cannot process Request");
                 }