[Jboss-svn-commits] JBL Code SVN: r1659 - trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-11-29 08:31:12 -0500 (Tue, 29 Nov 2005)
New Revision: 1659

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
Log:
- Fix getLocalPort and getLocalAddr.

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-28 21:49:46 UTC (rev 1658)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-29 13:31:12 UTC (rev 1659)
@@ -1024,11 +1024,7 @@
             if (localAddr == null && (socket != 0)) {
                 try {
                     long sa = Address.get(Socket.APR_LOCAL, socket);
-                    Sockaddr addr = new Sockaddr();
-                    if (Address.fill(addr, sa)) {
-                        localAddr = addr.hostname;
-                        localPort = addr.port;
-                    }
+                    localAddr = Address.getip(sa);
                 } catch (Exception e) {
                     log.warn(sm.getString("http11processor.socket.info"), e);
                 }
@@ -1042,8 +1038,7 @@
             if (remotePort == -1 && (socket != 0)) {
                 try {
                     long sa = Address.get(Socket.APR_REMOTE, socket);
-                    Sockaddr addr = Address.getInfo(sa);
-                    remotePort = addr.port;
+                    remotePort = Address.getInfo(sa).port;
                 } catch (Exception e) {
                     log.warn(sm.getString("http11processor.socket.info"), e);
                 }
@@ -1056,11 +1051,7 @@
             if (localPort == -1 && (socket != 0)) {
                 try {
                     long sa = Address.get(Socket.APR_LOCAL, socket);
-                    Sockaddr addr = new Sockaddr();
-                    if (Address.fill(addr, sa)) {
-                        localAddr = addr.hostname;
-                        localPort = addr.port;
-                    }
+                    localPort = Address.getInfo(sa).port;
                 } catch (Exception e) {
                     log.warn(sm.getString("http11processor.socket.info"), e);
                 }