Author: nextgens Date: 2008-09-01 22:50:42 +0000 (Mon, 01 Sep 2008) New Revision: 22329
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java trunk/freenet/src/freenet/node/NodeClientCore.java Log: get rid of ArchiveManager.maxArchiveSize : see http://archives.freenetproject.org/message/20080901.220139.b26aae2c.en.html Modified: trunk/freenet/src/freenet/client/ArchiveManager.java =================================================================== --- trunk/freenet/src/freenet/client/ArchiveManager.java 2008-09-01 22:43:40 UTC (rev 22328) +++ trunk/freenet/src/freenet/client/ArchiveManager.java 2008-09-01 22:50:42 UTC (rev 22329) @@ -34,8 +34,6 @@ public static final String METADATA_NAME = ".metadata"; private static boolean logMINOR; - private long maxArchiveSize; - final long maxArchivedFileSize; // ArchiveHandler's @@ -69,13 +67,12 @@ * @param random A cryptographicaly secure random source * @param weakRandom A weak and cheap random source */ - public ArchiveManager(int maxHandlers, long maxCachedData, long maxArchiveSize, long maxArchivedFileSize, int maxCachedElements, BucketFactory tempBucketFactory) { + public ArchiveManager(int maxHandlers, long maxCachedData, long maxArchivedFileSize, int maxCachedElements, BucketFactory tempBucketFactory) { maxArchiveHandlers = maxHandlers; archiveHandlers = new LRUHashtable(); this.maxCachedElements = maxCachedElements; this.maxCachedData = maxCachedData; storedData = new LRUHashtable(); - this.maxArchiveSize = maxArchiveSize; this.maxArchivedFileSize = maxArchivedFileSize; this.tempBucketFactory = tempBucketFactory; logMINOR = Logger.shouldLog(Logger.MINOR, this); @@ -199,8 +196,8 @@ throwAtExit = true; ctx.setLastHash(realHash); } - if(data.size() > Math.max(maxArchiveSize, archiveContext.maxArchiveSize)) - throw new ArchiveFailureException("Archive too big ("+data.size()+" > "+maxArchiveSize+")!"); + if(data.size() > archiveContext.maxArchiveSize) + throw new ArchiveFailureException("Archive too big ("+data.size()+" > "+archiveContext.maxArchiveSize+")!"); if(archiveType != Metadata.ARCHIVE_ZIP) throw new ArchiveFailureException("Unknown or unsupported archive algorithm "+archiveType); @@ -472,12 +469,4 @@ return Metadata.ARCHIVE_ZIP; else throw new IllegalArgumentException(); } - - public synchronized long getMaxArchiveSize() { - return maxArchiveSize; - } - - public synchronized void setMaxArchiveSize(long maxArchiveSize) { - this.maxArchiveSize = maxArchiveSize; - } } Modified: trunk/freenet/src/freenet/node/NodeClientCore.java =================================================================== --- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-09-01 22:43:40 UTC (rev 22328) +++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-09-01 22:50:42 UTC (rev 22329) @@ -21,7 +21,6 @@ import freenet.clients.http.filter.GenericReadFilterCallback; import freenet.config.Config; import freenet.config.InvalidConfigValueException; -import freenet.config.NodeNeedRestartException; import freenet.config.SubConfig; import freenet.crypt.RandomSource; import freenet.io.xfer.AbortedException; @@ -322,23 +321,8 @@ } }); setUploadAllowedDirs(nodeConfig.getStringArr("uploadAllowedDirs")); - - nodeConfig.register("maxArchiveSize", "2MiB", sortOrder++, true, false, "NodeClientCore.maxArchiveSize", "NodeClientCore.maxArchiveSizeLong", new LongCallback() { - - @Override - public Long get() { - return archiveManager.getMaxArchiveSize(); - } - - @Override - public void set(Long val) throws InvalidConfigValueException, NodeNeedRestartException { - if (get().equals(val)) - return; - archiveManager.setMaxArchiveSize(val); - } - }); - archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS, MAX_CACHED_ARCHIVE_DATA, nodeConfig.getLong("maxArchiveSize"), MAX_ARCHIVED_FILE_SIZE, MAX_CACHED_ELEMENTS, tempBucketFactory); + archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS, MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVED_FILE_SIZE, MAX_CACHED_ELEMENTS, tempBucketFactory); Logger.normal(this, "Initializing USK Manager"); System.out.println("Initializing USK Manager"); uskManager = new USKManager(this);
