[freenet-cvs] r20795 - branches/db4o/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-06-26 22:48:25 +0000 (Thu, 26 Jun 2008)
New Revision: 20795

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Fix NPE on removing

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-06-26 
22:35:18 UTC (rev 20794)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-06-26 
22:48:25 UTC (rev 20795)
@@ -557,12 +557,18 @@
                                container.delete(targetFile);
                        if(tempFile != null)
                                container.delete(tempFile);
-                       if(getFailedMessage != null)
+                       if(getFailedMessage != null) {
+                               container.activate(getFailedMessage, 5);
                                getFailedMessage.removeFrom(container);
-                       if(postFetchProtocolErrorMessage != null)
+                       }
+                       if(postFetchProtocolErrorMessage != null) {
+                               
container.activate(postFetchProtocolErrorMessage, 5);
                                
postFetchProtocolErrorMessage.removeFrom(container);
-                       if(allDataPending != null)
+                       }
+                       if(allDataPending != null) {
+                               container.activate(allDataPending, 5);
                                allDataPending.removeFrom(container);
+                       }
                }
                super.requestWasRemoved(container);
        }