[freenet-cvs] r19298 - in trunk/freenet/src/freenet: node store support/io

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-04-14 04:09:28 +0000 (Mon, 14 Apr 2008)
New Revision: 19298

Modified:
   trunk/freenet/src/freenet/node/MemoryChecker.java
   trunk/freenet/src/freenet/node/UptimeEstimator.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
   trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
Log:
cast where appropriate; might fix a bad bug in PaddedEphemerallyEncryptedBucket

Modified: trunk/freenet/src/freenet/node/MemoryChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/MemoryChecker.java   2008-04-14 03:54:31 UTC 
(rev 19297)
+++ trunk/freenet/src/freenet/node/MemoryChecker.java   2008-04-14 04:09:28 UTC 
(rev 19298)
@@ -47,7 +47,7 @@
                        ps.queueTimedJob(this, 120 * 250); // 30 sec
                        return;
                } else
-                       ps.queueTimedJob(this, 120 * sleeptime);
+                       ps.queueTimedJob(this, (long) 120 * 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-14 03:54:31 UTC 
(rev 19297)
+++ trunk/freenet/src/freenet/node/UptimeEstimator.java 2008-04-14 04:09:28 UTC 
(rev 19298)
@@ -101,7 +101,7 @@
                        if(slot == wasOnline.length) slot = 0;
                }
                long now = System.currentTimeMillis();
-               if(logFile.length() > wasOnline.length*4) {
+               if(logFile.length() > (long) wasOnline.length*4) {
                        prevFile.delete();
                        logFile.renameTo(prevFile);
                }

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-14 
03:54:31 UTC (rev 19297)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-14 
04:09:28 UTC (rev 19298)
@@ -513,7 +513,7 @@
                                        }
                                        x++;
                                        if(x % 1024 == 0) {
-                                               System.out.println("Reading 
store prior to shrink: "+(x*100/realSize)+ "% ( "+x+ '/' +realSize+ ')');
+                                               System.out.println("Reading 
store prior to shrink: "+((long)x*100/realSize)+ "% ( "+x+ '/' +realSize+ ')');
                                        }
                                        if(x == Integer.MAX_VALUE) {
                                                System.err.println("Key number 
"+x+" - ignoring store after "+(x*(dataBlockSize+headerBlockSize)+" bytes"));

Modified: 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2008-04-14 03:54:31 UTC (rev 19297)
+++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2008-04-14 04:09:28 UTC (rev 19298)
@@ -271,7 +271,7 @@
                if(size < minPaddedSize) size = minPaddedSize;
                if(size == minPaddedSize) return size;
                long min = minPaddedSize;
-               long max = minPaddedSize << 1;
+               long max = (long)minPaddedSize << 1;
                while(true) {
                        if(max < 0)
                                throw new Error("Impossible size: "+size+" - 
min="+min+", max="+max);