1 files changed, 4 insertions, 7 deletions
diff --git a/libjava/gnu/gcj/runtime/FileDeleter.java b/libjava/gnu/gcj/runtime/FileDeleter.java
index cc7aa9d50b7..d5f99d04c47 100644
--- a/libjava/gnu/gcj/runtime/FileDeleter.java
+++ b/libjava/gnu/gcj/runtime/FileDeleter.java
@@ -23,16 +23,13 @@ public final class FileDeleter
 
   // Helper method called by java.lang.Runtime.exit() to perform
   // pending deletions.
-  public static void deleteOnExitNow ()
+  public synchronized static void deleteOnExitNow ()
   {
-    while (!deleteOnExitStack.empty ())
-      ((File)(deleteOnExitStack.pop ())).delete ();
+    if (deleteOnExitStack != null)
+      while (!deleteOnExitStack.empty ())
+	((File)(deleteOnExitStack.pop ())).delete ();
   }
 
   // A stack of files to delete upon normal termination.
   private static Stack deleteOnExitStack;
 }
-
-
-
-