svn commit: r630850 - in /maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content: ArtifactExtensionMapping.java DefaultPathParser.java

[brett]

Author: brett
Date: Mon Feb 25 05:48:47 2008
New Revision: 630850

URL: http://svn.apache.org/viewvc?rev=630850&view=rev
Log:
[MRM-731] fix failure introduced by previous commit
Merged from: r630844, 630842

Modified:
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java?rev=630850&r1=630849&r2=630850&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
 Mon Feb 25 05:48:47 2008
@@ -93,15 +93,15 @@
 
     public static String mapExtensionToType( String extension )
     {
-        if ( extension.equals( "tar.gz" ) )
+        if ( "tar.gz".equals( extension ) )
         {
             return "distribution-tgz";
         }
-        else  if ( extension.equals( "tar.bz2" ) )
+        else  if ( "tar.bz2".equals( extension ) )
         {
             return "distribution-bzip";
         }
-        else  if ( extension.equals( "zip" ) )
+        else  if ( "zip".equals( extension ) )
         {
             return "distribution-zip";
         }

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java?rev=630850&r1=630849&r2=630850&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
 Mon Feb 25 05:48:47 2008
@@ -156,7 +156,12 @@
                     break;
                 case 0:
                     // End of the filename, only a simple extension left. - 
Set the type.
-                    artifact.setType( 
ArtifactExtensionMapping.mapExtensionToType( parser.getExtension() ) );
+                    String type = ArtifactExtensionMapping.mapExtensionToType( 
parser.getExtension() );
+                    if ( type == null )
+                    {
+                        throw new LayoutException( "Invalid artifact: no type 
was specified" );
+                    }
+                    artifact.setType( type );
                     break;
             }