Author: toad
Date: 2008-10-04 19:34:36 +0000 (Sat, 04 Oct 2008)
New Revision: 22942

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Put isSSK into a variable. Fixes an NPE.
This might affect you if you have queued SSK uploads.


Modified: 
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-10-04 19:33:21 UTC (rev 22941)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-10-04 19:34:36 UTC (rev 22942)
@@ -57,6 +57,7 @@
        final boolean getCHKOnly;
        final int sourceLength;
        private int consecutiveRNFs;
+       private boolean isSSK;

        public SingleBlockInserter(BaseClientPutter parent, Bucket data, short 
compressionCodec, FreenetURI uri, InsertContext ctx, PutCompletionCallback cb, 
boolean isMetadata, int sourceLength, int token, boolean getCHKOnly, boolean 
addToParent, boolean dontSendEncoded, Object tokenObject, ObjectContainer 
container, ClientContext context, boolean persistent) {
                super(persistent);
@@ -78,6 +79,7 @@
                this.isMetadata = isMetadata;
                this.sourceLength = sourceLength;
                this.getCHKOnly = getCHKOnly;
+               isSSK = uri.getKeyType().toUpperCase().equals("SSK");
                if(addToParent) {
                        parent.addBlock(container);
                        parent.addMustSucceedBlocks(1, container);
@@ -275,7 +277,7 @@
        }

        public boolean isSSK() {
-               return uri.getKeyType().toUpperCase().equals("SSK");
+               return isSSK;
        }

        public FreenetURI getURI(ObjectContainer container, ClientContext 
context) {


Reply via email to