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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-28 14:48:13 +0000 (Sat, 28 Jun 2008)
New Revision: 20843

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
Log:
Logging, activation

Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-06-28 14:14:11 UTC (rev 20842)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-06-28 14:48:13 UTC (rev 20843)
@@ -287,6 +287,7 @@
                                container.activate(decompressors, 5);
                                container.activate(returnBucket, 5);
                                container.activate(cb, 1);
+                               container.activate(fetchContext, 1);
                        }
                        while(!decompressors.isEmpty()) {
                                Compressor c = (Compressor) 
decompressors.removeLast();
@@ -299,6 +300,8 @@
                                        cb.onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), this, container, context);
                                        return;
                                } catch (CompressionOutputSizeException e) {
+                                       if(Logger.shouldLog(Logger.MINOR, this))
+                                               Logger.minor(this, "Too big: 
maxSize = "+fetchContext.maxOutputLength+" maxTempSize = 
"+fetchContext.maxTempLength);
                                        cb.onFailure(new 
FetchException(FetchException.TOO_BIG, e.estimatedSize, false /* FIXME */, 
clientMetadata.getMIMEType()), this, container, context);
                                        return;
                                }
@@ -311,6 +314,7 @@
                        System.err.println("Failing above attempted fetch...");
                        cb.onFailure(new 
FetchException(FetchException.INTERNAL_ERROR, e), this, container, context);
                } catch (Throwable t) {
+                       Logger.error(this, "Caught "+t, t);
                        cb.onFailure(new 
FetchException(FetchException.INTERNAL_ERROR, t), this, container, context);
                }
        }