Author: jdumay
Date: Sun Nov 16 19:42:13 2008
New Revision: 718167
URL: http://svn.apache.org/viewvc?rev=718167&view=rev
Log:
MRM-1004 - RepositoryServlet tests fail intermittently on Windows.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=718167&r1=718166&r2=718167&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Sun Nov 16 19:42:13 2008
@@ -589,8 +589,18 @@
{
// MavenXpp3Reader leaves the file open, so we need to close it
ourselves.
FileReader reader = new FileReader( pom );
- Model model = new MavenXpp3Reader().read( reader );
- reader.close();
+ Model model = null;
+ try
+ {
+ model = new MavenXpp3Reader().read( reader );
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ reader.close();
+ }
+ }
DistributionManagement dist = model.getDistributionManagement();
if ( dist != null )
