[freenet-cvs] r12923 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-04-24 14:06:40 +0000 (Tue, 24 Apr 2007)
New Revision: 12923

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Fix several NPEs on UploadFrom=redirect: Set a mime type (it can of course be 
null)

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-24 13:24:07 UTC 
(rev 12922)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-24 14:06:40 UTC 
(rev 12923)
@@ -119,7 +119,6 @@
                if(uploadFrom == ClientPutMessage.UPLOAD_FROM_REDIRECT) {
                        this.targetURI = redirectTarget;
                        Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT, 
targetURI, cm);
-                       cm = null;
                        byte[] d;
                        try {
                                d = m.writeToByteArray();
@@ -128,7 +127,7 @@
                                Logger.error(this, "Impossible: "+e, e);
                                onFailure(new 
InserterException(InserterException.INTERNAL_ERROR, "Impossible: "+e+" in 
ClientPut", null), null);
                                this.data = null;
-                               clientMetadata = null;
+                               clientMetadata = cm;
                                putter = null;
                                return;
                        }
@@ -194,7 +193,6 @@
                if(uploadFrom == ClientPutMessage.UPLOAD_FROM_REDIRECT) {
                        this.targetURI = message.redirectTarget;
                        Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT, 
targetURI, cm);
-                       cm = null;
                        byte[] d;
                        try {
                                d = m.writeToByteArray();
@@ -203,7 +201,7 @@
                                Logger.error(this, "Impossible: "+e, e);
                                onFailure(new 
InserterException(InserterException.INTERNAL_ERROR, "Impossible: "+e+" in 
ClientPut", null), null);
                                this.data = null;
-                               clientMetadata = null;
+                               clientMetadata = cm;
                                putter = null;
                                return;
                        }
@@ -314,7 +312,6 @@
                        if(logMINOR)
                                Logger.minor(this, "Uploading from redirect for 
"+this+" : "+targetURI);
                        Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT, 
targetURI, cm);
-                       cm = null;
                        byte[] d;
                        try {
                                d = m.writeToByteArray();
@@ -323,7 +320,7 @@
                                Logger.error(this, "Impossible: "+e, e);
                                onFailure(new 
InserterException(InserterException.INTERNAL_ERROR, "Impossible: "+e+" in 
ClientPut", null), null);
                                this.data = null;
-                               clientMetadata = null;
+                               clientMetadata = cm;
                                origFilename = null;
                                putter = null;
                                return;