[freenet-cvs] r14563 - trunk/freenet/src/freenet/support/io

[toad at freenetproject.org]

Author: toad
Date: 2007-08-09 14:28:43 +0000 (Thu, 09 Aug 2007)
New Revision: 14563

Modified:
   trunk/freenet/src/freenet/support/io/BaseFileBucket.java
Log:
Log the impossible NPE, only at normal if we are shutting down.

Modified: trunk/freenet/src/freenet/support/io/BaseFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BaseFileBucket.java	2007-08-09 14:27:30 UTC (rev 14562)
+++ trunk/freenet/src/freenet/support/io/BaseFileBucket.java	2007-08-09 14:28:43 UTC (rev 14563)
@@ -8,6 +8,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.tanukisoftware.wrapper.WrapperManager;
+
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
@@ -24,7 +26,15 @@
 	public BaseFileBucket(File file) {
 		this.length = file.length();
 		if(deleteOnExit()) {
-			file.deleteOnExit();
+			try {
+				file.deleteOnExit();
+			} catch (NullPointerException e) {
+				if(WrapperManager.hasShutdownHookBeenTriggered()) {
+					Logger.normal(this, "NullPointerException setting deleteOnExit while shutting down - buggy JVM code: "+e, e);
+				} else {
+					Logger.error(this, "Caught "+e+" doing deleteOnExit() for "+file+" - JVM bug ????");
+				}
+			}
 		}
 	}