remm 2003/08/19 09:15:21
Modified: http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
- Avoid a NPE if requesting the remote address between requests or before
processing any request.
Revision Changes Path
1.75 +1 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Http11Processor.java 17 Aug 2003 14:52:30 -0000 1.74
+++ Http11Processor.java 19 Aug 2003 16:15:21 -0000 1.75
@@ -820,7 +820,7 @@
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
- if (remoteAddr == null) {
+ if ((remoteAddr == null) && (socket != null)) {
remoteAddr = socket.getInetAddress().getHostAddress();
request.remoteAddr().setString(remoteAddr);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
