amyroh 2003/11/21 13:10:22
Modified: http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
Fix NPE - was thrown from org.apache.coyote.RequestInfo.getRemoteAddr when getting
"remoteAddr" via JMX.
Revision Changes Path
1.88 +18 -9
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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Http11Processor.java 17 Nov 2003 09:42:40 -0000 1.87
+++ Http11Processor.java 21 Nov 2003 21:10:21 -0000 1.88
@@ -994,21 +994,30 @@
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
- if ((remoteAddr == null) && (socket != null))
- remoteAddr = socket.getInetAddress().getHostAddress();
-
+ if ((remoteAddr == null) && (socket != null)) {
+ InetAddress inetAddr = socket.getInetAddress();
+ if (inetAddr != null) {
+ remoteAddr = inetAddr.getHostAddress();
+ }
+ }
request.remoteAddr().setString(remoteAddr);
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {
- if (remoteAddr == null)
- remoteAddr = socket.getInetAddress().getHostAddress();
-
+ if ((remoteAddr == null) && (socket !=null)) {
+ InetAddress inetAddr = socket.getInetAddress();
+ if (inetAddr != null) {
+ remoteAddr = inetAddr.getHostAddress();
+ }
+ }
request.remoteAddr().setString(remoteAddr);
- if (remoteHost == null)
- remoteHost = socket.getInetAddress().getHostName();
-
+ if ((remoteHost == null) && (socket != null)) {
+ InetAddress inetAddr = socket.getInetAddress();
+ if (inetAddr != null) {
+ remoteHost = inetAddr.getHostName();
+ }
+ }
request.remoteHost().setString(remoteHost);
if (remotePort == -1)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
