Author: toad
Date: 2009-03-07 20:46:15 +0000 (Sat, 07 Mar 2009)
New Revision: 25950

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Fix NPE


Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java   2009-03-07 
20:39:58 UTC (rev 25949)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java   2009-03-07 
20:46:15 UTC (rev 25950)
@@ -537,10 +537,7 @@
                                container.activate(origFilename, 5);
                                container.delete(origFilename);
                        }
-                       if(clientMetadata != null) {
-                               container.activate(clientMetadata, 5);
-                               clientMetadata.removeFrom(container);
-                       }
+                       // clientMetadata will be deleted by putter
                        if(targetURI != null && targetURI != 
FreenetURI.EMPTY_CHK_URI) {
                                container.activate(targetURI, 5);
                                targetURI.removeFrom(container);

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

Reply via email to