billbarker 2002/11/07 22:19:51
Modified: coyote/src/java/org/apache/coyote/tomcat3
Tomcat3Request.java
Log:
Clean up the handling of remoteAddr and remoteHost.
We share both of these with the coyoteRequest, so there is no reason to duplicate.
Revision Changes Path
1.11 +0 -22
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Tomcat3Request.java 19 Jun 2002 18:21:24 -0000 1.10
+++ Tomcat3Request.java 8 Nov 2002 06:19:51 -0000 1.11
@@ -210,36 +210,14 @@
public MessageBytes remoteAddr() {
if( remoteAddrMB.isNull() ) {
- try {
- remoteAddrMB.duplicate(coyoteRequest.remoteAddr());
- } catch(IOException iex) { // can't happen
- }
- }
- if( remoteAddrMB.isNull() ) {
coyoteRequest.action( ActionCode.ACTION_REQ_HOST_ATTRIBUTE, coyoteRequest
);
- try{
- remoteAddrMB.duplicate( coyoteRequest.remoteAddr() );
- remoteHostMB.duplicate( coyoteRequest.remoteHost() );
- } catch(IOException iex) { // can't happen
- }
}
return remoteAddrMB;
}
public MessageBytes remoteHost() {
if( remoteHostMB.isNull() ) {
- try {
- remoteHostMB.duplicate(coyoteRequest.remoteHost());
- } catch(IOException iex) { // can't happen
- }
- }
- if( remoteHostMB.isNull() ) {
coyoteRequest.action( ActionCode.ACTION_REQ_HOST_ATTRIBUTE, coyoteRequest
);
- try{
- remoteAddrMB.duplicate( coyoteRequest.remoteAddr() );
- remoteHostMB.duplicate( coyoteRequest.remoteHost() );
- } catch(IOException iex) { // can't happen
- }
}
return remoteHostMB;
}
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
