svn commit: r453251 - /maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java

[evenisse]

Author: evenisse
Date: Thu Oct  5 07:34:06 2006
New Revision: 453251

URL: http://svn.apache.org/viewvc?view=rev&rev=453251
Log:
Fix FNFE when basedir contains spaces

Modified:
    
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java

Modified: 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java?view=diff&rev=453251&r1=453250&r2=453251
==============================================================================
--- 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
 (original)
+++ 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
 Thu Oct  5 07:34:06 2006
@@ -22,6 +22,7 @@
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -103,7 +104,17 @@
         }
 
         DirectoryScanner scanner = new DirectoryScanner();
-        scanner.setBasedir( repositoryBase );
+        try
+        {
+            //Fix FNFE when repositoryBase contain spaces
+            //TODO: move this code in DirectoryScanner.setBasedir()
+            scanner.setBasedir( repositoryBase.getCanonicalFile() );
+        }
+        catch( IOException e )
+        {
+            scanner.setBasedir( repositoryBase );
+        }
+
         if ( includes != null )
         {
             scanner.setIncludes( includes );