Changeset 6109 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-08-03T03:12:25+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8870 - Data layer context menu: Go to OSM wiki page does not always work

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1076 +1076 @@
                                 } else {
                                     int osize = conn.getContentLength();
-                                    conn.disconnect();
-
-                                    conn = Utils.openHttpConnection(new URI(u.toString()
-                                            .replace("=", "%3D") /* do not URLencode whole string! */
-                                            .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
-                                            ).toURL());
-                                    conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                                    if (osize > -1) {
+                                        conn.disconnect();
+    
+                                        conn = Utils.openHttpConnection(new URI(u.toString()
+                                                .replace("=", "%3D") /* do not URLencode whole string! */
+                                                .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
+                                                ).toURL());
+                                        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                                    }
 
                                     /* redirect pages have different content length, but retrieving a "nonredirect"
@@ -1088 +1090 @@
                                      *  content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
                                      */
-                                    if (Math.abs(conn.getContentLength() - osize) > 200) {
+                                    if (conn.getContentLength() != -1 && osize > -1 && Math.abs(conn.getContentLength() - osize) > 200) {
                                         Main.info("{0} is a mediawiki redirect", u);
                                         conn.disconnect();