[freenet-cvs] r22828 - branches/db4o/freenet/src/freenet/client

[t...@freenetproject.org]

Author: toad
Date: 2008-09-24 23:18:12 +0000 (Wed, 24 Sep 2008)
New Revision: 22828

Modified:
   branches/db4o/freenet/src/freenet/client/ArchiveManager.java
Log:
Merge 1160 into db4o branch: 22306->22339


Modified: branches/db4o/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveManager.java        
2008-09-24 23:10:15 UTC (rev 22827)
+++ branches/db4o/freenet/src/freenet/client/ArchiveManager.java        
2008-09-24 23:18:12 UTC (rev 22828)
@@ -38,8 +38,6 @@
        public static final String METADATA_NAME = ".metadata";
        private static boolean logMINOR;

-       private long maxArchiveSize;
-
        final long maxArchivedFileSize;

        // ArchiveHandler's
@@ -73,13 +71,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);
@@ -215,8 +212,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);

@@ -493,11 +490,4 @@
                ArchiveHandlerImpl.init(container, context, nodeDBHandle);
        }

-       public synchronized long getMaxArchiveSize() {
-               return maxArchiveSize;
-       }
-
-       public synchronized void setMaxArchiveSize(long maxArchiveSize) {
-               this.maxArchiveSize = maxArchiveSize;
-       }
 }