Author: toad
Date: 2009-03-18 18:26:39 +0000 (Wed, 18 Mar 2009)
New Revision: 26098

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
Log:
activate(this, 2) is BAD when this happens to contain a HashMap. See 
http://tracker.db4o.com/browse/COR-1582
Make appropriate activations of fields instead.


Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java       
2009-03-18 18:23:00 UTC (rev 26097)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java       
2009-03-18 18:26:39 UTC (rev 26098)
@@ -310,8 +310,10 @@
 
        private void trySendGeneratedURIMessage(FCPConnectionOutputHandler 
handler, ObjectContainer container) {
                FCPMessage msg;
-               if(persistenceType == PERSIST_FOREVER)
+               if(persistenceType == PERSIST_FOREVER) {
                        container.activate(client, 1);
+                       container.activate(generatedURI, 5);
+               }
                synchronized(this) {
                        msg = new URIGeneratedMessage(generatedURI, identifier, 
isGlobalQueue());
                }
@@ -378,9 +380,6 @@
                        Logger.error(this, "WTF? 
persistenceType="+persistenceType, new Exception("error"));
                        return;
                }
-               if(persistenceType == PERSIST_FOREVER) {
-                       container.activate(this, 2);
-               }
                if(includePersistentRequest) {
                        FCPMessage msg = persistentTagMessage(container);
                        handler.queue(msg);

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to