svn commit: r583652 - in /maven/archiva/trunk/archiva-web/archiva-webapp/src: main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java

[joakime]

Author: joakime
Date: Wed Oct 10 17:32:22 2007
New Revision: 583652

URL: http://svn.apache.org/viewvc?rev=583652&view=rev
Log:
Fixing test case NPE wrt repo.location.


Modified:
    
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
    
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java

Modified: 
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?rev=583652&r1=583651&r2=583652&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
 (original)
+++ 
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
 Wed Oct 10 17:32:22 2007
@@ -111,7 +111,7 @@
     {
         if ( repositoryMap.isEmpty() )
         {
-            repositoryMap = 
configuration.getConfiguration().getManagedRepositoriesAsMap();
+            repositoryMap.putAll( 
configuration.getConfiguration().getManagedRepositoriesAsMap() );
         }
         return repositoryMap.get( prefix );
     }

Modified: 
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java?rev=583652&r1=583651&r2=583652&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
 (original)
+++ 
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
 Wed Oct 10 17:32:22 2007
@@ -124,6 +124,12 @@
         ManagedRepositoryConfiguration repo = new 
ManagedRepositoryConfiguration();
         repo.setId( NEW_REPOSITORY_ID );
         repo.setName( NEW_REPOSITORY_NAME );
+        File repoRoot = new File( getBasedir(), "target/test-repository-root" 
);
+        if ( !repoRoot.exists() )
+        {
+            repoRoot.mkdirs();
+        }
+        repo.setLocation( repoRoot.getAbsolutePath() );
         c.addManagedRepository( repo );
         // TODO it would be better to use a mock configuration and "save" to 
more accurately reflect the calls made
         servlet.configurationEvent( new ConfigurationEvent( 
ConfigurationEvent.SAVED) );