[freenet-cvs] r14311 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-07-24 17:18:14 +0000 (Tue, 24 Jul 2007)
New Revision: 14311

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
Log:
better logging

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2007-07-24 17:10:49 UTC 
(rev 14310)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2007-07-24 17:18:14 UTC 
(rev 14311)
@@ -109,7 +109,8 @@
                                else
                                        ret = fctx.bucketFactory.makeBucket(-1);
                        } catch (IOException e) {
-                               onFailure(new 
FetchException(FetchException.BUCKET_ERROR), null);
+                               Logger.error(this, "Cannot create bucket for 
temp storage: "+e, e);
+                               onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), null);
                                getter = null;
                                returnBucket = null;
                                return;
@@ -176,12 +177,15 @@
                                else
                                        ret = fctx.bucketFactory.makeBucket(-1);
                        } catch (IOException e) {
-                               onFailure(new 
FetchException(FetchException.BUCKET_ERROR), null);
+                               Logger.error(this, "Cannot create bucket for 
temp storage: "+e, e);
+                               onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), null);
                                getter = null;
                                returnBucket = null;
                                return;
                        }
                }
+               if(ret == null)
+                       Logger.error(this, "Impossible: ret = null in FCP 
constructor for "+this, new Exception("debug"));
                returnBucket = ret;
                if(persistenceType != PERSIST_CONNECTION)
                        try {
@@ -281,6 +285,8 @@
                                succeeded = false;
                        }
                }
+               if(ret == null)
+                       Logger.error(this, "Impossible: ret = null in SFS 
constructor for "+this, new Exception("debug"));
                returnBucket = ret;

                String[] allowed = fs.getAll("AllowedMIMETypes");