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

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

Author: mla...@jb...
Date: 2006-05-13 06:11:23 -0400 (Sat, 13 May 2006)
New Revision: 4213

Modified:
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
Log:
Use APR_UNSPEC only if the address contains colon.

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-13 00:27:10 UTC (rev 4212)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java	2006-05-13 10:11:23 UTC (rev 4213)
@@ -553,8 +553,10 @@
             addressStr = address.getHostAddress();
         }
         int family = Socket.APR_INET;
-        if (Library.APR_HAVE_IPV6)
-            family= Socket.APR_UNSPEC;
+        if (Library.APR_HAVE_IPV6 && addressStr != null) {
+            if (addressStr.indexOf(':') >= 0)
+                family= Socket.APR_UNSPEC;
+        }
         long inetAddress = Address.info(addressStr, family,
                 port, 0, rootPool);
         // Create the APR server socket