[Jboss-svn-commits] JBL Code SVN: r4247 - labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net

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

Author: mla...@jb...
Date: 2006-05-16 09:49:28 -0400 (Tue, 16 May 2006)
New Revision: 4247

Modified:
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
Log:
Use APR_UNSPEC for IPv6 and address=null.

Modified: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java	2006-05-16 13:45:56 UTC (rev 4246)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java	2006-05-16 13:49:28 UTC (rev 4247)
@@ -553,9 +553,11 @@
             addressStr = address.getHostAddress();
         }
         int family = Socket.APR_INET;
-        if (Library.APR_HAVE_IPV6 && addressStr != null) {
-            if (addressStr.indexOf(':') >= 0)
-                family= Socket.APR_UNSPEC;
+        if (Library.APR_HAVE_IPV6) {
+            if (addressStr == null)
+                family = Socket.APR_UNSPEC;
+            else if (addressStr.indexOf(':') >= 0)
+                family = Socket.APR_UNSPEC;
         }
         long inetAddress = Address.info(addressStr, family,
                 port, 0, rootPool);