Changeset 6348 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2013-10-31T21:14:35+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #7019 - Don't perform proxy resolution when not needed (slows down startup and preferences save of instances frequently switching between "no proxy" and "manual proxy" if the proxy cannot be resolved)

File:

• trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -100 +100 @@
             proxyPolicy = ProxyPolicy.NO_PROXY;
         } else {
-            proxyPolicy= ProxyPolicy.fromName(value);
+            proxyPolicy = ProxyPolicy.fromName(value);
             if (proxyPolicy == null) {
                 Main.warn(tr("Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.", ProxyPreferencesPanel.PROXY_POLICY, value));
@@ -108 +108 @@
         String host = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST, null);
         int port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_HTTP_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_PORT, null));
-        if (host != null && !host.trim().isEmpty() && port > 0) {
-            httpProxySocketAddress = new InetSocketAddress(host,port);
-        } else {
-            httpProxySocketAddress = null;
-            if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
+        httpProxySocketAddress = null;
+        if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
+            if (host != null && !host.trim().isEmpty() && port > 0) {
+                httpProxySocketAddress = new InetSocketAddress(host, port);
+            } else {
                 Main.warn(tr("Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
                 Main.warn(tr("The proxy will not be used."));
@@ -120 +120 @@
         host = Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_HOST, null);
         port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_SOCKS_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_PORT, null));
-        if (host != null && !host.trim().isEmpty() && port > 0) {
-            socksProxySocketAddress = new InetSocketAddress(host,port);
-        } else {
-            socksProxySocketAddress = null;
-            if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
+        socksProxySocketAddress = null;
+        if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
+            if (host != null && !host.trim().isEmpty() && port > 0) {
+                socksProxySocketAddress = new InetSocketAddress(host,port);
+            } else {
                 Main.warn(tr("Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
                 Main.warn(tr("The proxy will not be used."));