[freenet-cvs] r20642 - branches/db4o/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-06-24 13:01:32 +0000 (Tue, 24 Jun 2008)
New Revision: 20642

Modified:
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Some transient (for debugging), some debugging paranoia

Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-06-24 
13:00:52 UTC (rev 20641)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-06-24 
13:01:32 UTC (rev 20642)
@@ -125,14 +125,14 @@
         * - Deactivation is simpler.
         * Note that the priorities are thread priorities, not request 
priorities.
         */
-       public final PrioritizedSerialExecutor clientDatabaseExecutor;
+       public transient final PrioritizedSerialExecutor clientDatabaseExecutor;
        /**
         * Whenever a new request is added, we have to check the datastore. We 
funnel all such access
         * through this thread. Note that the priorities are request 
priorities, not thread priorities.
         */
-       public final PrioritizedSerialExecutor datastoreCheckerExecutor;
+       public transient final PrioritizedSerialExecutor 
datastoreCheckerExecutor;

-       public final ClientContext clientContext;
+       public transient final ClientContext clientContext;

        public static int maxBackgroundUSKFetchers;

@@ -1188,6 +1188,7 @@

                DBJobWrapper(DBJob job) {
                        this.job = job;
+                       if(job == null) throw new NullPointerException();
                }

                final DBJob job;
@@ -1195,6 +1196,8 @@
                public void run() {

                        try {
+                               if(job == null) throw new 
NullPointerException();
+                               if(node == null) throw new 
NullPointerException();
                                job.run(node.db, clientContext);
                                node.db.commit();
                                LinkedList toFree = 
persistentTempBucketFactory.grabBucketsToFree();