You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/05/13 20:25:07 UTC

svn commit: r943968 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net: InetAddress.java Socket.java

Author: hindessm
Date: Thu May 13 18:25:06 2010
New Revision: 943968

URL: http://svn.apache.org/viewvc?rev=943968&view=rev
Log:
Fix java.net.preferIPv* properties to accept upper case (by using
utility methods that already do the right thing).  Probably we should
refactor the code to remove these and just fix the callers to use
NetUtil.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/InetAddress.java
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/Socket.java

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/InetAddress.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/InetAddress.java?rev=943968&r1=943967&r2=943968&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/InetAddress.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/InetAddress.java Thu May 13 18:25:06 2010
@@ -1342,9 +1342,7 @@ public class InetAddress extends Object 
     }
 
     static boolean preferIPv6Addresses() {
-        String result = AccessController.doPrivileged(new PriviAction<String>(
-                "java.net.preferIPv6Addresses")); //$NON-NLS-1$
-        return "true".equals(result); //$NON-NLS-1$
+        return NetUtil.preferIPv6Addresses();
     }
 
     private static final ObjectStreamField[] serialPersistentFields = {

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/Socket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/Socket.java?rev=943968&r1=943967&r2=943968&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/Socket.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/net/Socket.java Thu May 13 18:25:06 2010
@@ -1112,9 +1112,7 @@ public class Socket {
     }
 
     static boolean preferIPv4Stack() {
-        String result = AccessController.doPrivileged(new PriviAction<String>(
-                "java.net.preferIPv4Stack")); //$NON-NLS-1$
-        return "true".equals(result); //$NON-NLS-1$
+        return NetUtil.preferIPv4Stack();
     }
 
     /**