You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ev...@apache.org on 2006/10/09 11:51:21 UTC

svn commit: r454323 - in /maven/archiva/trunk: archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java

Author: evenisse
Date: Mon Oct  9 02:51:18 2006
New Revision: 454323

URL: http://svn.apache.org/viewvc?view=rev&rev=454323
Log:
Fix NPE when repository path contains spaces

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

Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java?view=diff&rev=454323&r1=454322&r2=454323
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java Mon Oct  9 02:51:18 2006
@@ -21,6 +21,7 @@
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -51,6 +52,13 @@
     {
         File repositoryDirectory = new File( configuration.getDirectory() );
         String repoDir = repositoryDirectory.toURI().toString();
+
+        //workaround for spaces non converted by PathUtils in wagon
+        //todo: remove it when PathUtils will be fixed
+        if ( repoDir.indexOf( "%20" ) >= 0 )
+        {
+            repoDir = StringUtils.replace( repoDir, "%20", " " );
+        }
 
         ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( configuration.getLayout() );
         return repoFactory.createArtifactRepository( configuration.getId(), repoDir, layout, null, null );

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=454323&r1=454322&r2=454323
==============================================================================
--- 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 Mon Oct  9 02:51:18 2006
@@ -104,16 +104,8 @@
         }
 
         DirectoryScanner scanner = new DirectoryScanner();
-        try
-        {
-            //Fix FNFE when repositoryBase contain spaces
-            //TODO: move this code in DirectoryScanner.setBasedir()
-            scanner.setBasedir( repositoryBase.getCanonicalFile() );
-        }
-        catch( IOException e )
-        {
-            scanner.setBasedir( repositoryBase );
-        }
+
+        scanner.setBasedir( repositoryBase );
 
         if ( includes != null )
         {