Author: toad
Date: 2008-12-18 21:34:17 +0000 (Thu, 18 Dec 2008)
New Revision: 24520
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientContext.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
branches/db4o/freenet/src/freenet/node/Node.java
branches/db4o/freenet/src/freenet/support/compress/RealCompressor.java
Log:
Do not store these objects to the database, ever.
Modified: branches/db4o/freenet/src/freenet/client/async/ClientContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-12-18 16:06:13 UTC (rev 24519)
+++ branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-12-18 21:34:17 UTC (rev 24520)
@@ -17,6 +17,7 @@
import freenet.node.RequestStarterGroup;
import freenet.node.Ticker;
import freenet.support.Executor;
+import freenet.support.Logger;
import freenet.support.api.BucketFactory;
import freenet.support.compress.RealCompressor;
import freenet.support.io.FilenameGenerator;
@@ -173,4 +174,9 @@
return chkFetchScheduler;
}
+ public boolean objectCanNew(ObjectContainer container) {
+ Logger.error(this, "Not storing ClientContext in database", new
Exception("error"));
+ return false;
+ }
+
}
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
2008-12-18 16:06:13 UTC (rev 24519)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
2008-12-18 21:34:17 UTC (rev 24520)
@@ -53,5 +53,10 @@
recentSuccesses.remove(0);
}
-
+ public boolean objectCanNew(ObjectContainer container) {
+ Logger.error(this, "Not storing
ClientRequestSchedulerNonPersistent in database", new Exception("error"));
+ return false;
+ }
+
+
}
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2008-12-18 16:06:13 UTC
(rev 24519)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2008-12-18 21:34:17 UTC
(rev 24520)
@@ -3976,4 +3976,10 @@
public boolean shallWeRouteAccordingToOurPeersLocation() {
return routeAccordingToOurPeersLocation &&
Version.lastGoodBuild() >= 1160;
}
+
+ public boolean objectCanNew(ObjectContainer container) {
+ Logger.error(this, "Not storing Node in database", new
Exception("error"));
+ return false;
+ }
+
}
Modified: branches/db4o/freenet/src/freenet/support/compress/RealCompressor.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/compress/RealCompressor.java
2008-12-18 16:06:13 UTC (rev 24519)
+++ branches/db4o/freenet/src/freenet/support/compress/RealCompressor.java
2008-12-18 21:34:17 UTC (rev 24520)
@@ -12,6 +12,8 @@
import freenet.support.io.NativeThread;
import java.util.LinkedList;
+import com.db4o.ObjectContainer;
+
public class RealCompressor implements PrioRunnable {
private final Executor exec;
@@ -90,4 +92,10 @@
}, "Compressor thread for " + currentJob);
}
}
+
+ public boolean objectCanNew(ObjectContainer container) {
+ Logger.error(this, "Not storing NodeClientCore in database",
new Exception("error"));
+ return false;
+ }
+
}
\ No newline at end of file
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
