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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-24 14:13:32 +0000 (Tue, 24 Apr 2007)
New Revision: 12924

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Fix NPEs with UploadFrom=redirect

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-24 14:06:40 UTC 
(rev 12923)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-24 14:13:32 UTC 
(rev 12924)
@@ -379,7 +379,8 @@
        public SimpleFieldSet getFieldSet() {
                SimpleFieldSet fs = super.getFieldSet();
                // This is all fixed, so no need for synchronization.
-               fs.putSingle("Metadata.ContentType", 
clientMetadata.getMIMEType());
+               if(clientMetadata.getMIMEType() != null)
+                       fs.putSingle("Metadata.ContentType", 
clientMetadata.getMIMEType());
                fs.putSingle("UploadFrom", 
ClientPutMessage.uploadFromString(uploadFrom));
                if(uploadFrom == ClientPutMessage.UPLOAD_FROM_DISK) {
                        fs.putSingle("Filename", origFilename.getPath());