Changeset 3321 in josm for trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

Timestamp:

2010-06-08T21:56:38+02:00 (14 years ago)

Author:

jttt

Message:

Validate tagging presets when they're added in Preferences dialog

File:

• trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) (5 diffs)

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

@@ -72 +72 @@
      * than one files have this extension, the last file whose name includes <code>namepart</code>
      * is opened.
-     * 
+     *
      * @param extension  the extension of the file we're looking for
      * @param namepart the name part
@@ -104 +104 @@
             if(file.getName().endsWith(".zip")) {
                 System.err.println(tr("Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
-                file.getName(), e.toString(), extension, namepart));
+                        file.getName(), e.toString(), extension, namepart));
             }
         }
@@ -140 +140 @@
     }
 
-    private File checkLocal(URL url, String destDir, long maxTime) {
+    private File checkLocal(URL url, String destDir, long maxTime) throws IOException {
         String localPath = Main.pref.get("mirror." + url);
         File file = null;
@@ -171 +171 @@
             URLConnection conn = url.openConnection();
             conn.setConnectTimeout(5000);
+            conn.setReadTimeout(5000);
             bis = new BufferedInputStream(conn.getInputStream());
             bos = new BufferedOutputStream( new FileOutputStream(destDirFile));
@@ -178 +179 @@
                 bos.write(buffer, 0, length);
             }
-        } catch(IOException ioe) {
-            if (file != null)
-                return file;
-            return null;
         } finally {
             if (bis != null) {