Changeset 7321 in josm

Timestamp:

2014-07-21T01:51:53+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10287 - robustness to system time going backwards during josm startup

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/SplashScreen.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -197 +197 @@
             long now = System.currentTimeMillis();
             String prevMessageTitle = messages.getLast();
-            if (!prevMessageTitle.isEmpty()) {
+            // now should always be >= time but if can be inferior sometimes, see #10287
+            if (!prevMessageTitle.isEmpty() && now >= time) {
                 messages.removeLast();
                 messages.add(tr("{0} ({1})", prevMessageTitle, Utils.getDurationString(now - time)));

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -887 +887 @@
     public static String getDurationString(long elapsedTime) throws IllegalArgumentException {
         if (elapsedTime < 0) {
-            throw new IllegalArgumentException("elapsedTime must be > 0");
+            throw new IllegalArgumentException("elapsedTime must be >= 0");
         }
         // Is it less than 1 second ?