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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-11 13:31:50 +0000 (Sat, 11 Nov 2006)
New Revision: 10882

Modified:
   trunk/freenet/src/freenet/support/Fields.java
Log:
Fix handling of larger SI multipliers (thanks UniquePerson).

Modified: trunk/freenet/src/freenet/support/Fields.java
===================================================================
--- trunk/freenet/src/freenet/support/Fields.java       2006-11-11 02:12:03 UTC 
(rev 10881)
+++ trunk/freenet/src/freenet/support/Fields.java       2006-11-11 13:31:50 UTC 
(rev 10882)
@@ -596,14 +596,14 @@
                                        1 << 10,
                                        1000 * 1000,
                                        1 << 20,
-                                       1000 * 1000 * 1000,
+                                       1000l * 1000l * 1000l,
                                        1 << 30,
-                                       1000 * 1000 * 1000 * 1000,
-                                       1 << 40,
-                                       1000 * 1000 * 1000 * 1000 * 1000,
-                                       1 << 50,
-                                       1000 * 1000 * 1000 * 1000 * 1000 * 1000,
-                                       1 << 60 };
+                                       1000l * 1000l * 1000l * 1000l,
+                                       1l << 40,
+                                       1000l * 1000l * 1000l * 1000l * 1000,
+                                       1l << 50,
+                                       1000l * 1000l * 1000l * 1000l * 1000l * 
1000l,
+                                       1l << 60 };
                        while ((x >= 0)
                                && ((idx = "kKmMgGtTpPeE".indexOf(s.charAt(x))) 
!= -1)) {
                                x--;