[500245] Lob cache can't be deleted (streams not closed?)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=500245

2 files changed, 53 insertions, 20 deletions

diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index c84c8696ca..694f0104bd 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.tests;singleton:=true
-Bundle-Version: 4.1.400.qualifier
+Bundle-Version: 4.1.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -18,15 +18,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
  org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.tests;version="4.1.400",
- org.eclipse.net4j.tests.apps;version="4.1.400",
- org.eclipse.net4j.tests.bugzilla;version="4.1.400",
- org.eclipse.net4j.tests.bundle;version="4.1.400";x-internal:=true,
- org.eclipse.net4j.tests.data;version="4.1.400",
- org.eclipse.net4j.tests.defs;version="4.1.400",
- org.eclipse.net4j.tests.signal;version="4.1.400",
- org.eclipse.net4j.util.tests;version="4.1.0",
- org.eclipse.net4j.util.tests.cache;version="4.1.0",
- org.eclipse.net4j.util.tests.defs;version="4.1.0",
- org.eclipse.net4j.util.tests.defs.impl;version="4.1.0",
- org.eclipse.net4j.util.tests.defs.util;version="4.1.0"
+Export-Package: org.eclipse.net4j.tests;version="4.1.500",
+ org.eclipse.net4j.tests.apps;version="4.1.500",
+ org.eclipse.net4j.tests.bugzilla;version="4.1.500",
+ org.eclipse.net4j.tests.bundle;version="4.1.500";x-internal:=true,
+ org.eclipse.net4j.tests.data;version="4.1.500",
+ org.eclipse.net4j.tests.defs;version="4.1.500",
+ org.eclipse.net4j.tests.signal;version="4.1.500",
+ org.eclipse.net4j.util.tests;version="4.1.500",
+ org.eclipse.net4j.util.tests.cache;version="4.1.500",
+ org.eclipse.net4j.util.tests.defs;version="4.1.500",
+ org.eclipse.net4j.util.tests.defs.impl;version="4.1.500",
+ org.eclipse.net4j.util.tests.defs.util;version="4.1.500"
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index f7338b3bbf..8420c88071 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -92,7 +92,7 @@ public abstract class AbstractOMTest extends TestCase
 
   private static String testName;
 
-  private transient List<File> filesToDelete = new ArrayList<File>();
+  private transient final List<File> filesToDelete = new ArrayList<File>();
 
   private transient String codeLink;
 
@@ -435,19 +435,52 @@ public abstract class AbstractOMTest extends TestCase
     deleteFiles();
   }
 
-  public synchronized void deleteFiles()
+  public void deleteFiles()
   {
-    for (File file : filesToDelete)
+    synchronized (filesToDelete)
     {
-      IOUtil.delete(file);
+      for (File file : filesToDelete)
+      {
+        IOUtil.delete(file);
+      }
+      filesToDelete.clear();
+    }
+  }
+
+  public void addFileToDelete(File file)
+  {
+    synchronized (filesToDelete)
+    {
+      filesToDelete.add(file);
     }
+  }
 
-    filesToDelete.clear();
+  public File getTempName() throws IORuntimeException
+  {
+    File name = TMPUtil.getTempName();
+    addFileToDelete(name);
+    return name;
+  }
+
+  public File getTempName(String prefix) throws IORuntimeException
+  {
+    File name = TMPUtil.getTempName(prefix);
+    addFileToDelete(name);
+    return name;
+  }
+
+  public File getTempName(String prefix, String suffix) throws IORuntimeException
+  {
+    File name = TMPUtil.getTempName(prefix, suffix);
+    addFileToDelete(name);
+    return name;
   }
 
-  public synchronized void addFileToDelete(File file)
+  public File getTempName(String prefix, String suffix, File directory) throws IORuntimeException
   {
-    filesToDelete.add(file);
+    File name = TMPUtil.getTempName(prefix, suffix, directory);
+    addFileToDelete(name);
+    return name;
   }
 
   public File createTempFolder() throws IORuntimeException