[freenet-cvs] r13909 - trunk/freenet/src/freenet/support

[zot...@freenetproject.org]

Author: zothar
Date: 2007-07-03 23:12:25 +0000 (Tue, 03 Jul 2007)
New Revision: 13909

Modified:
   trunk/freenet/src/freenet/support/TimeUtil.java
Log:
Don't assume we won't have more than int weeks, etc in TimeUtil; fixes Bug #1492

Modified: trunk/freenet/src/freenet/support/TimeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeUtil.java     2007-07-03 22:28:11 UTC 
(rev 13908)
+++ trunk/freenet/src/freenet/support/TimeUtil.java     2007-07-03 23:12:25 UTC 
(rev 13909)
@@ -57,7 +57,7 @@
             return sb.toString();
         }
         //
-        int weeks = (int)(l / ((long)7*24*60*60*1000));
+        long weeks = (long)(l / ((long)7*24*60*60*1000));
         if (weeks > 0) {
             sb.append(weeks).append('w');
             termCount++;
@@ -67,7 +67,7 @@
             return sb.toString();
         }
         //
-        int days = (int)(l / ((long)24*60*60*1000));
+        long days = (long)(l / ((long)24*60*60*1000));
         if (days > 0) {
             sb.append(days).append('d');
             termCount++;
@@ -77,7 +77,7 @@
           return sb.toString();
         }
         //
-        int hours = (int)(l / ((long)60*60*1000));
+        long hours = (long)(l / ((long)60*60*1000));
         if (hours > 0) {
             sb.append(hours).append('h');
             termCount++;
@@ -87,7 +87,7 @@
             return sb.toString();
         }
         //
-        int minutes = (int)(l / ((long)60*1000));
+        long minutes = (long)(l / ((long)60*1000));
         if (minutes > 0) {
             sb.append(minutes).append('m');
             termCount++;
@@ -105,7 +105,7 @@
                 //l = l - ((long)fractionalSeconds * (long)1000);
             }
         } else {
-            int seconds = (int)(l / (long)1000);
+            long seconds = (long)(l / (long)1000);
             if (seconds > 0) {
                 sb.append(seconds).append('s');
                 termCount++;