[RESTEASY-1080] DataSourceProvider does not delete the temporary file…

…s it creates
resteasy · Jul 24, 2014 · 854ec43 · 854ec43
1 parent 1247f0b
commit 854ec43
Showing 1 changed file with 33 additions and 2 deletions.
diff --git a/...resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java b/...resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java
@@ -43,7 +43,7 @@ protected static class SequencedDataSource implements DataSource
       private final File tempFile;
       private final String type;
 
-      public SequencedDataSource(byte[] byteBuffer, int byteBufferOffset,
+      protected SequencedDataSource(byte[] byteBuffer, int byteBufferOffset,
                                  int byteBufferLength, File tempFile, String type)
       {
          super();
@@ -67,7 +67,37 @@ public InputStream getInputStream() throws IOException
          if (tempFile == null)
             return bis;
          InputStream fis = new FileInputStream(tempFile);
-         return new SequenceInputStream(bis, fis);
+         return new SequenceInputStream(bis, fis) {
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException 
+            {
+               int r = super.read(b, off, len);
+               if(r == -1)
+               {
+                  deleteTempFile();
+               }
+               return r;
+            }
+
+            @Override
+            public int read() throws IOException 
+            {
+               int r = super.read();
+               if(r == -1)
+               {
+                  deleteTempFile();
+               }
+               return r;
+            }
+         };
+      }
+
+      private void deleteTempFile()
+      {
+         if(tempFile.exists())
+         {
+            tempFile.delete();
+         }
       }
 
       @Override
@@ -103,6 +133,7 @@ public static DataSource readDataSource(final InputStream in, final MediaType me
          int count = in.read(buffer, 0, buffer.length);
          if (count > -1) {
              tempFile = File.createTempFile("resteasy-provider-datasource", null);
+             tempFile.deleteOnExit();
              FileOutputStream fos = new FileOutputStream(tempFile);
              fos.write(buffer, 0, count);
              try