Author: toad
Date: 2009-03-07 14:01:30 +0000 (Sat, 07 Mar 2009)
New Revision: 25933

Modified:
   branches/db4o/freenet/src/freenet/client/InsertException.java
Log:
Fix NPEs


Modified: branches/db4o/freenet/src/freenet/client/InsertException.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/InsertException.java       
2009-03-07 14:01:13 UTC (rev 25932)
+++ branches/db4o/freenet/src/freenet/client/InsertException.java       
2009-03-07 14:01:30 UTC (rev 25933)
@@ -172,8 +172,14 @@
        }
 
        public void removeFrom(ObjectContainer container) {
-               errorCodes.removeFrom(container);
-               uri.removeFrom(container);
+               if(errorCodes != null) {
+                       container.activate(errorCodes, 1);
+                       errorCodes.removeFrom(container);
+               }
+               if(uri != null) {
+                       container.activate(uri, 5);
+                       uri.removeFrom(container);
+               }
                container.delete(this);
        }
 }

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

Reply via email to