[freenet-cvs] r20245 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-06-06 19:25:48 +0000 (Fri, 06 Jun 2008)
New Revision: 20245

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Fix passing stuff around again

Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-06 19:23:38 UTC (rev 20244)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-06 19:25:48 UTC (rev 20245)
@@ -21,7 +21,6 @@
 import freenet.support.OOMHandler;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
-import freenet.support.compress.CompressionOutputSizeException;
 import freenet.support.compress.Compressor;
 import freenet.support.io.BucketTools;

@@ -547,14 +546,14 @@
                        return parent;
                }

-               public void onEncode(BaseClientKey key, ClientPutState state, 
ObjectContainer container) {
+               public void onEncode(BaseClientKey key, ClientPutState state, 
ObjectContainer container, ClientContext context) {
                        synchronized(this) {
                                if(state != metadataPutter) return;
                        }
-                       cb.onEncode(key, this, container);
+                       cb.onEncode(key, this, container, context);
                }

-               public void cancel(ObjectContainer container) {
+               public void cancel(ObjectContainer container, ClientContext 
context) {
                        ClientPutState oldSFI = null;
                        ClientPutState oldMetadataPutter = null;
                        synchronized(this) {
@@ -562,9 +561,9 @@
                                oldMetadataPutter = metadataPutter;
                        }
                        if(oldSFI != null)
-                               oldSFI.cancel(container);
+                               oldSFI.cancel(container, context);
                        if(oldMetadataPutter != null)
-                               oldMetadataPutter.cancel(container);
+                               oldMetadataPutter.cancel(container, context);

                        if(freeData)
                                block.free();
@@ -672,7 +671,7 @@
                return parent;
        }

-       public void cancel() {
+       public void cancel(ObjectContainer container, ClientContext context) {
                if(freeData)
                        block.free();
        }