[freenet-cvs] r7940 - in trunk/freenet/src/freenet: client client/async node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-26 21:23:37 +0000 (Thu, 26 Jan 2006)
New Revision: 7940

Modified:
   trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/node/Version.java
Log:
392: (mandatory)
fix client bug that caused OOMs.

Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-01-26 
21:09:43 UTC (rev 7939)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-01-26 
21:23:37 UTC (rev 7940)
@@ -69,7 +69,7 @@
        }

        // REDFLAG: How big is one of these?
-       private static int MAX_CACHED_CODECS = 16;
+       private static int MAX_CACHED_CODECS = 8;
        // REDFLAG: Optimal stripe size? Smaller => less memory usage, but more 
JNI overhead
        private static int STRIPE_SIZE = 4096;
        // REDFLAG: Make this configurable, maybe make it depend on # CPUs

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 21:09:43 UTC (rev 7939)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 21:23:37 UTC (rev 7940)
@@ -419,8 +419,7 @@
        // Real onFailure
        private void onFailure(FetchException e, boolean forceFatal) {
                if(parent.isCancelled() || cancelled) {
-                       onFailure(new FetchException(FetchException.CANCELLED));
-                       return;
+                       e = new FetchException(FetchException.CANCELLED);
                }
                if(!(e.isFatal() || forceFatal) ) {
                        if(retryCount <= maxRetries) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-26 21:09:43 UTC (rev 
7939)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-26 21:23:37 UTC (rev 
7940)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 391;
+       public static final int buildNumber = 392;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 390;
+       public static final int lastGoodBuild = 392;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;