Changeset 7853 in josm

Timestamp:

2014-12-20T13:31:07+01:00 (10 years ago)

Author:

Don-vip

Message:

fix/debug problems seen on Jenkins:

• delete old windows installer files before building new one
• better error message for unexplained regression + attempt to fix it by synchronization in CachedFile

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/CachedFile.java (modified) (3 diffs)
• windows/josm-setup-unix.sh (modified) (1 diff)

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

@@ -66 +66 @@
 
     protected File cacheFile = null;
-    boolean initialized = false;
+    protected boolean initialized = false;
 
     public static final long DEFAULT_MAXTIME = -1L;
@@ -178 +178 @@
                     throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
                 return is;
-            } else throw new IOException();
+            } else {
+                throw new IllegalStateException("No file found for something different from a resource: "+name);
+            }
         }
         return new FileInputStream(file);
@@ -189 +191 @@
      * @throws IOException when the resource with the given name could not be retrieved
      */
-    public File getFile() throws IOException {
+    public synchronized File getFile() throws IOException {
         if (initialized)
             return cacheFile;

trunk/windows/josm-setup-unix.sh

@@ -121 +121 @@
         # launch4j - http://launch4j.sourceforge.net/
         # delete old exe file first
-        /bin/rm -f ${TARGET}.exe
+        /bin/rm -f ${TARGET}*.exe
         $LAUNCH4J "launch4j_${TARGET}.xml"
         # comment previous line and uncomment next one on Windows