[freenet-cvs] r20659 - branches/db4o/freenet/src/freenet/support/io

[t...@freenetproject.org]

Author: toad
Date: 2008-06-24 20:37:38 +0000 (Tue, 24 Jun 2008)
New Revision: 20659

Modified:
   branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
Log:
Logging and paranoia (I have seen infinite recursion in db4o activation 
stacktraces, repeatedly visiting DelayedFreeBucket.onActivate... :( )

Modified: branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java 
2008-06-24 20:36:24 UTC (rev 20658)
+++ branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java 
2008-06-24 20:37:38 UTC (rev 20659)
@@ -108,6 +108,12 @@
        }

        public void objectOnActivate(ObjectContainer container) {
+               if(Logger.shouldLog(Logger.MINOR, this))
+                       Logger.minor(this, "Activating "+super.toString());
+               if(bucket == this) {
+                       Logger.error(this, "objectOnActivate on 
DelayedFreeBucket: wrapping self!!!");
+                       return;
+               }
                // Cascading activation of dependancies
                container.activate(bucket, 1);
        }