[freenet-cvs] r19341 - in trunk/freenet/src/freenet: node store

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-04-15 04:59:57 +0000 (Tue, 15 Apr 2008)
New Revision: 19341

Modified:
   trunk/freenet/src/freenet/node/MemoryChecker.java
   trunk/freenet/src/freenet/node/UptimeEstimator.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
remove the explicit casting to (long) where possible, replacing constants by 
long ones

Modified: trunk/freenet/src/freenet/node/MemoryChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/MemoryChecker.java   2008-04-15 01:20:23 UTC 
(rev 19340)
+++ trunk/freenet/src/freenet/node/MemoryChecker.java   2008-04-15 04:59:57 UTC 
(rev 19341)
@@ -47,7 +47,7 @@
                        ps.queueTimedJob(this, 120 * 250); // 30 sec
                        return;
                } else
-                       ps.queueTimedJob(this, (long) 120 * sleeptime);
+                       ps.queueTimedJob(this, 120L * sleeptime);

                // FIXME
                // Do not remove until all known memory issues fixed,

Modified: trunk/freenet/src/freenet/node/UptimeEstimator.java
===================================================================
--- trunk/freenet/src/freenet/node/UptimeEstimator.java 2008-04-15 01:20:23 UTC 
(rev 19340)
+++ trunk/freenet/src/freenet/node/UptimeEstimator.java 2008-04-15 04:59:57 UTC 
(rev 19341)
@@ -101,7 +101,7 @@
                        if(slot == wasOnline.length) slot = 0;
                }
                long now = System.currentTimeMillis();
-               if(logFile.length() > (long) wasOnline.length*4) {
+               if(logFile.length() > wasOnline.length*4L) {
                        prevFile.delete();
                        logFile.renameTo(prevFile);
                }

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-15 
01:20:23 UTC (rev 19340)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-15 
04:59:57 UTC (rev 19341)
@@ -518,7 +518,7 @@
                                        }
                                        x++;
                                        if(x % 1024 == 0) {
-                                               System.out.println("Reading 
store prior to shrink: "+((long)x*100/realSize)+ "% ( "+x+ '/' +realSize+ ')');
+                                               System.out.println("Reading 
store prior to shrink: "+(x*100L/realSize)+ "% ( "+x+ '/' +realSize+ ')');
                                        }
                                        if(x == Integer.MAX_VALUE) {
                                                System.err.println("Key number 
"+x+" - ignoring store after "+(x*(dataBlockSize+headerBlockSize)+" bytes"));