Author: toad
Date: 2008-12-22 19:46:16 +0000 (Mon, 22 Dec 2008)
New Revision: 24751

Modified:
   branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
Log:
Delete later, logging.


Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java    
2008-12-22 19:45:42 UTC (rev 24750)
+++ branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java    
2008-12-22 19:46:16 UTC (rev 24751)
@@ -109,7 +109,7 @@
                final ProxyCallback proxyCallback = new ProxyCallback();
                
                if(Logger.shouldLog(Logger.MINOR, ArchiveHandlerImpl.class))
-                       Logger.minor(ArchiveHandlerImpl.class, "Scheduling 
off-thread extraction: "+tag.data+" for "+tag.handler.key+" element 
"+tag.element+" for "+tag.callback);
+                       Logger.minor(ArchiveHandlerImpl.class, "Scheduling 
off-thread extraction: "+tag.data+" for "+tag.handler.key+" element 
"+tag.element+" for "+tag.callback, new Exception("debug"));
                
                context.mainExecutor.execute(new Runnable() {
 
@@ -142,13 +142,13 @@
                                                public void run(ObjectContainer 
container, ClientContext context) {
                                                        if(logMINOR)
                                                                
Logger.minor(this, "Calling callback for "+tag.data+" for "+tag.handler.key+" 
element "+tag.element+" for "+tag.callback);
-                                                       container.delete(tag);
                                                        
container.activate(tag.callback, 1);
                                                        if(proxyCallback.data 
== null)
                                                                
tag.callback.notInArchive(container, context);
                                                        else
                                                                
tag.callback.gotBucket(data, container, context);
                                                        
container.deactivate(tag.callback, 1);
+                                                       container.delete(tag);
                                                }
                                                
                                        }, NativeThread.NORM_PRIORITY, false);
@@ -158,9 +158,9 @@
                                        context.jobRunner.queue(new DBJob() {
 
                                                public void run(ObjectContainer 
container, ClientContext context) {
-                                                       container.delete(tag);
                                                        
container.activate(tag.callback, 1);
                                                        
tag.callback.onFailed(e, container, context);
+                                                       container.delete(tag);
                                                }
                                                
                                        }, NativeThread.NORM_PRIORITY, false);
@@ -170,9 +170,9 @@
                                        context.jobRunner.queue(new DBJob() {
 
                                                public void run(ObjectContainer 
container, ClientContext context) {
-                                                       container.delete(tag);
                                                        
container.activate(tag.callback, 1);
                                                        
tag.callback.onFailed(e, container, context);
+                                                       container.delete(tag);
                                                }
                                                
                                        }, NativeThread.NORM_PRIORITY, false);

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

Reply via email to