You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/04/23 08:13:47 UTC

svn commit: r650757 - /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java

Author: brett
Date: Tue Apr 22 23:13:45 2008
New Revision: 650757

URL: http://svn.apache.org/viewvc?rev=650757&view=rev
Log:
[MRM-781] make sure file is closed
Submitted by: James William Dumay

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=650757&r1=650756&r2=650757&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java Tue Apr 22 23:13:45 2008
@@ -132,9 +132,20 @@
     {
         if (!isCollection())
         {
-            IOUtils.copy(new FileInputStream(localResource), outputContext.getOutputStream());
-            outputContext.setContentLength(getContentLength());
-            outputContext.setContentType(getContentType());
+	    FileInputStream is = null;
+	    try
+	    {
+	        outputContext.setContentLength(getContentLength());
+		outputContext.setContentType(getContentType());
+		
+		//Write content to stream
+		is = new FileInputStream(localResource);
+		IOUtils.copy(is, outputContext.getOutputStream());
+	    }
+	    finally
+	    {
+		IOUtils.closeQuietly(is);
+	    }
         }
         else
         {