Changeset 8295 in josm
- Timestamp:
- 2015-04-30T22:02:38+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r8100 r8295 17 17 import java.lang.annotation.RetentionPolicy; 18 18 import java.lang.reflect.Field; 19 import java.net.InetAddress; 20 import java.net.Inet6Address; 19 21 import java.nio.charset.StandardCharsets; 20 22 import java.nio.file.Files; … … 925 927 } 926 928 } 929 if("auto".equals(get("prefer.ipv6", "auto"))) { 930 new Thread(new Runnable() { /* this may take some time (DNS, Connect) */ 931 public void run() { 932 boolean hasv6 = false; 933 try { 934 /* Use the check result from last run of the software, as after the test value 935 changes have no effect anymore */ 936 if(getBoolean("validated.ipv6", false)) { 937 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"); 938 } 939 for(InetAddress a : InetAddress.getAllByName("josm.openstreetmap.de")) { 940 if(a instanceof Inet6Address) { 941 if(a.isReachable(1000)) { 942 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"); 943 if(!getBoolean("validated.ipv6", false)) { 944 Main.info(tr("Automatics detected useable IPv6 network, prefering IPv6 over IPv4 after next restart.")); 945 } else { 946 Main.info(tr("Automatics detected useable IPv6 network, prefering IPv6 over IPv4.")); 947 } 948 hasv6 = true; 949 } 950 break; /* we're done */ 951 } 952 } 953 } catch (Exception e) { 954 } 955 put("validated.ipv6", hasv6); 956 } 957 }).start(); 958 } 927 959 } 928 960 … … 1373 1405 */ 1374 1406 public void updateSystemProperties() { 1375 if( getBoolean("prefer.ipv6",false)) {1407 if("true".equals(get("prefer.ipv6", "auto"))) { 1376 1408 // never set this to false, only true! 1377 1409 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
Note:
See TracChangeset
for help on using the changeset viewer.