[freenet-cvs] r12538 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2007-04-03 16:10:58 +0000 (Tue, 03 Apr 2007)
New Revision: 12538

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
more logging

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-03 
16:06:04 UTC (rev 12537)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-03 
16:10:58 UTC (rev 12538)
@@ -515,6 +515,10 @@
                                                                (null, 
prefix+"CHK_accessTime", chkDB, secDbConfig);
                }
                } catch (DatabaseException e1) {
+                       // Log this now because close() will probably throw too
+                       System.err.println("Error opening access times db: 
"+e1);
+                       e1.printStackTrace();
+                       Logger.error(this, "Error opening access times db: 
"+e1, e1);
                        close(false);
                        throw e1;
                }
@@ -564,6 +568,10 @@
                                (null, prefix+"CHK_blockNum", chkDB, 
blockNoDbConfig);
                }
                } catch (DatabaseException e1) {
+                       // Log this now because close() will probably throw too
+                       System.err.println("Error opening block nums db: "+e1);
+                       e1.printStackTrace();
+                       Logger.error(this, "Error opening block nums db: "+e1, 
e1);
                        close(false);
                        throw e1;
                }
@@ -2201,8 +2209,12 @@
                                reallyClosed = true;
                        }
                }catch(Throwable ex){
-                       Logger.error(this,"Error while closing database.",ex);
-                       ex.printStackTrace();
+                       try {
+                               Logger.error(this,"Error while closing 
database.",ex);
+                               ex.printStackTrace();
+                       } catch (Throwable t) {
+                               // Return anyway
+                       }
                }
     }