[freenet-cvs] r20679 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-06-25 14:02:45 +0000 (Wed, 25 Jun 2008)
New Revision: 20679

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Fix another activation related NPE

Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-25 13:59:47 UTC (rev 20678)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-25 14:02:45 UTC (rev 20679)
@@ -52,6 +52,7 @@
        private final boolean freeData; // this is being set, but never read ???
        private final String targetFilename;
        private final boolean earlyEncode;
+       private final boolean persistent;

        /**
         * @param parent
@@ -84,6 +85,7 @@
                this.insertAsArchiveManifest = insertAsArchiveManifest;
                this.freeData = freeData;
                this.targetFilename = targetFilename;
+               this.persistent = parent.persistent();
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
        }

@@ -706,6 +708,8 @@
        }

        public void onStartCompression(int i, ObjectContainer container, 
ClientContext context) {
+               if(persistent)
+                       container.activate(ctx, 2);
                if(parent == cb)
                        ctx.eventProducer.produceEvent(new 
StartedCompressionEvent(i), container, context);
        }