remm 2004/06/24 09:20:21
Modified: catalina/src/share/org/apache/catalina/valves
RequestFilterValve.java ErrorReportValve.java
PersistentValve.java AccessLogValve.java
catalina/src/share/org/apache/catalina/authenticator
Constants.java
catalina/src/share/org/apache/catalina/connector
Request.java CoyoteAdapter.java
Log:
- Last (?) round of casts removal.
Revision Changes Path
1.7 +4 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
Index: RequestFilterValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestFilterValve.java 23 Jun 2004 08:24:56 -0000 1.6
+++ RequestFilterValve.java 24 Jun 2004 16:20:20 -0000 1.7
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import javax.servlet.ServletException;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
@@ -269,12 +268,8 @@
// Check the deny patterns, if any
for (int i = 0; i < denies.length; i++) {
if (denies[i].match(property)) {
- ServletResponse sres = response.getResponse();
- if (sres instanceof HttpServletResponse) {
- HttpServletResponse hres = (HttpServletResponse) sres;
- hres.sendError(HttpServletResponse.SC_FORBIDDEN);
- return;
- }
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ return;
}
}
@@ -293,12 +288,7 @@
}
// Deny this request
- ServletResponse sres = response.getResponse();
- if (sres instanceof HttpServletResponse) {
- HttpServletResponse hres = (HttpServletResponse) sres;
- hres.sendError(HttpServletResponse.SC_FORBIDDEN);
- return;
- }
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
1.20 +3 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ErrorReportValve.java 23 Jun 2004 13:51:34 -0000 1.19
+++ ErrorReportValve.java 24 Jun 2004 16:20:20 -0000 1.20
@@ -127,10 +127,8 @@
;
}
- ServletResponse sresponse = (ServletResponse) response;
- if (sresponse instanceof HttpServletResponse)
- ((HttpServletResponse) sresponse).sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
1.8 +4 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Index: PersistentValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PersistentValve.java 23 Jun 2004 13:51:34 -0000 1.7
+++ PersistentValve.java 24 Jun 2004 16:20:20 -0000 1.8
@@ -21,7 +21,6 @@
import java.io.IOException;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -102,7 +101,7 @@
StandardHost host = (StandardHost) getContainer();
Context context = request.getContext();
if (context == null) {
- ((HttpServletResponse) response.getResponse()).sendError
+ response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
sm.getString("standardHost.noContext"));
return;
@@ -113,8 +112,7 @@
(context.getLoader().getClassLoader());
// Update the session last access time for our session (if any)
- HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
- String sessionId = hreq.getRequestedSessionId();
+ String sessionId = request.getRequestedSessionId();
Manager manager = context.getManager();
if (sessionId != null && manager != null) {
if (manager instanceof PersistentManager) {
@@ -154,7 +152,7 @@
// HttpSession hsess = hreq.getSession(false);
HttpSession hsess;
try {
- hsess = hreq.getSession();
+ hsess = request.getSession();
} catch (Exception ex) {
hsess = null;
}
1.12 +32 -44
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AccessLogValve.java 23 Jun 2004 08:24:57 -0000 1.11
+++ AccessLogValve.java 24 Jun 2004 16:20:21 -0000 1.12
@@ -29,11 +29,7 @@
import java.util.TimeZone;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.catalina.Lifecycle;
@@ -786,13 +782,8 @@
String value = null;
- ServletRequest req = request.getRequest();
- HttpServletRequest hreq = (HttpServletRequest) req;
- ServletResponse res = response.getResponse();
- HttpServletResponse hres = (HttpServletResponse) res;
-
if (pattern == 'a') {
- value = req.getRemoteAddr();
+ value = request.getRemoteAddr();
} else if (pattern == 'A') {
try {
value = InetAddress.getLocalHost().getHostAddress();
@@ -808,54 +799,54 @@
} else if (pattern == 'B') {
value = "" + response.getContentLength();
} else if (pattern == 'h') {
- value = req.getRemoteHost();
+ value = request.getRemoteHost();
} else if (pattern == 'H') {
- value = req.getProtocol();
+ value = request.getProtocol();
} else if (pattern == 'l') {
value = "-";
} else if (pattern == 'm') {
- if (hreq != null)
- value = hreq.getMethod();
+ if (request != null)
+ value = request.getMethod();
else
value = "";
} else if (pattern == 'p') {
- value = "" + req.getServerPort();
+ value = "" + request.getServerPort();
} else if (pattern == 'D') {
value = "" + time;
} else if (pattern == 'q') {
String query = null;
- if (hreq != null)
- query = hreq.getQueryString();
+ if (request != null)
+ query = request.getQueryString();
if (query != null)
value = "?" + query;
else
value = "";
} else if (pattern == 'r') {
StringBuffer sb = new StringBuffer();
- if (hreq != null) {
- sb.append(hreq.getMethod());
+ if (request != null) {
+ sb.append(request.getMethod());
sb.append(space);
- sb.append(hreq.getRequestURI());
- if (hreq.getQueryString() != null) {
+ sb.append(request.getRequestURI());
+ if (request.getQueryString() != null) {
sb.append('?');
- sb.append(hreq.getQueryString());
+ sb.append(request.getQueryString());
}
sb.append(space);
- sb.append(hreq.getProtocol());
+ sb.append(request.getProtocol());
} else {
sb.append("- - ");
- sb.append(req.getProtocol());
+ sb.append(request.getProtocol());
}
value = sb.toString();
} else if (pattern == 'S') {
- if (hreq != null)
- if (hreq.getSession(false) != null)
- value = hreq.getSession(false).getId();
+ if (request != null)
+ if (request.getSession(false) != null)
+ value = request.getSession(false).getId();
else value = "-";
else
value = "-";
} else if (pattern == 's') {
- if (hres != null)
+ if (response != null)
value = "" + response.getStatus();
else
value = "-";
@@ -875,17 +866,17 @@
} else if (pattern == 'T') {
value = timeTakenFormatter.format(time/1000d);
} else if (pattern == 'u') {
- if (hreq != null)
- value = hreq.getRemoteUser();
+ if (request != null)
+ value = request.getRemoteUser();
if (value == null)
value = "-";
} else if (pattern == 'U') {
- if (hreq != null)
- value = hreq.getRequestURI();
+ if (request != null)
+ value = request.getRequestURI();
else
value = "-";
} else if (pattern == 'v') {
- value = req.getServerName();
+ value = request.getServerName();
} else {
value = "???" + pattern + "???";
}
@@ -911,13 +902,10 @@
Object value = null;
- ServletRequest req = request.getRequest();
- HttpServletRequest hreq = (HttpServletRequest) req;
-
switch (type) {
case 'i':
- if (null != hreq)
- value = hreq.getHeader(header);
+ if (null != request)
+ value = request.getHeader(header);
else
value= "??";
break;
@@ -927,7 +915,7 @@
break;
*/
case 'c':
- Cookie[] c = hreq.getCookies();
+ Cookie[] c = request.getCookies();
for (int i=0; c != null && i < c.length; i++){
if (header.equals(c[i].getName())){
value = c[i].getValue();
@@ -936,14 +924,14 @@
}
break;
case 'r':
- if (null != hreq)
- value = hreq.getAttribute(header);
+ if (null != request)
+ value = request.getAttribute(header);
else
value= "??";
break;
case 's':
- if (null != hreq) {
- HttpSession sess = hreq.getSession(false);
+ if (null != request) {
+ HttpSession sess = request.getSession(false);
if (null != sess)
value = sess.getAttribute(header);
}
1.3 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 27 Feb 2004 14:58:41 -0000 1.2
+++ Constants.java 24 Jun 2004 16:20:21 -0000 1.3
@@ -53,10 +53,10 @@
* also call several existing methods on Request to determine whether
* or not any user has been authenticated:</p>
* <ul>
- * <li><strong>((HttpServletRequest) getRequest()).getAuthType()</strong>
+ * <li><strong>request.getAuthType()</strong>
* will return BASIC, CLIENT-CERT, DIGEST, FORM, or <code>null</code>
* if there is no authenticated user.</li>
- * <li><strong>((HttpServletRequest) getRequest()).getUserPrincipal()</strong>
+ * <li><strong>request.getUserPrincipal()</strong>
* will return the authenticated <code>Principal</code> returned by the
* <code>Realm</code> that authenticated this user.</li>
* </ul>
1.4 +2 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Request.java 24 Jun 2004 15:28:28 -0000 1.3
+++ Request.java 24 Jun 2004 16:20:21 -0000 1.4
@@ -45,7 +45,6 @@
import javax.servlet.ServletRequestAttributeListener;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.tomcat.util.buf.B2CConverter;
@@ -2249,7 +2248,7 @@
Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
session.getId());
configureSessionCookie(cookie);
- ((HttpServletResponse) response).addCookie(cookie);
+ response.addCookie(cookie);
}
if (session != null) {
1.3 +2 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteAdapter.java 23 Jun 2004 16:59:41 -0000 1.2
+++ CoyoteAdapter.java 24 Jun 2004 16:20:21 -0000 1.3
@@ -19,8 +19,6 @@
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Wrapper;
@@ -375,8 +373,7 @@
request.setRequestedSessionURL(false);
if (log.isDebugEnabled())
log.debug(" Requested cookie session id is " +
- ((HttpServletRequest) request.getRequest())
- .getRequestedSessionId());
+ request.getRequestedSessionId());
} else {
if (!request.isRequestedSessionIdValid()) {
// Replace the session id until one is valid
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
