costin 02/04/09 13:14:11
Modified: coyote/src/java/org/apache/coyote/tomcat3
CoyoteInterceptor2.java Tomcat3Request.java
Log:
Fix get/setAttribute, thanks Bill.
Revision Changes Path
1.7 +19 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
Index: CoyoteInterceptor2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CoyoteInterceptor2.java 9 Apr 2002 18:37:24 -0000 1.6
+++ CoyoteInterceptor2.java 9 Apr 2002 20:14:11 -0000 1.7
@@ -210,14 +210,10 @@
*/
public Object getInfo( Context ctx, org.apache.tomcat.core.Request request,
int id, String key ) {
-
- Tomcat3Request httpReq;
-
- try {
- httpReq=(Tomcat3Request)request;
- } catch (ClassCastException e){
+ if( ! ( request instanceof Tomcat3Request ) )
return null;
- }
+
+ Tomcat3Request httpReq=(Tomcat3Request)request;
if(key!=null && httpReq!=null ){
org.apache.coyote.Request cReq = httpReq.getCoyoteRequest();
@@ -231,8 +227,24 @@
httpReq.getCoyoteRequest() );
return cReq.getAttribute(key);
}
+
+ return cReq.getAttribute( key );
}
return super.getInfo(ctx,request,id,key);
+ }
+
+ public void setInfo( Context ctx, org.apache.tomcat.core.Request request,
+ int id, String key, String object ) {
+ if( ! ( request instanceof Tomcat3Request ) )
+ return;
+
+ Tomcat3Request httpReq=(Tomcat3Request)request;
+
+ if(key!=null && httpReq!=null ){
+ org.apache.coyote.Request cReq = httpReq.getCoyoteRequest();
+ cReq.setAttribute(key, object);
+ }
+ super.setInfo(ctx,request,id,key, object);
}
/**
1.9 +0 -13
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Request.java
Index: Tomcat3Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Request.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Tomcat3Request.java 9 Apr 2002 18:37:24 -0000 1.8
+++ Tomcat3Request.java 9 Apr 2002 20:14:11 -0000 1.9
@@ -292,17 +292,4 @@
public boolean isSecure() {
return "https".equalsIgnoreCase( coyoteRequest.scheme().toString());
}
-
- public void setAttribute(String name, Object value) {
- coyoteRequest.setAttribute( name, value );
- }
-
- public Object getAttribute(String name) {
- if (name == null) {
- return null;
- }
- return coyoteRequest.getAttribute( name );
- }
-
-
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
