This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 4c1e0e49e14940ff76dce93b3419aad9aab2cea8 Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Mar 13 19:20:14 2020 +0100 Fixing extension handling --- .../src/main/java/org/apache/archiva/repository/content/Artifact.java | 4 ++-- ...ng-context-no-mock-conf.xml => spring-context-repository-conf.xml} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Artifact.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Artifact.java index a86d1c3..e7bae8e 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Artifact.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/Artifact.java @@ -99,8 +99,8 @@ public interface Artifact extends ContentItem default String getExtension( ) { final String name = getAsset( ).getName( ); - final int idx = name.lastIndexOf( '.' ); - if ( idx >= 0 ) + final int idx = name.lastIndexOf( '.' )+1; + if ( idx > 0 ) { return name.substring( idx ); } diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml similarity index 90% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml index 40c7dc9..3915ff4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml @@ -27,8 +27,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd";> <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.repository.maven.metadata.storage.mock,org.apache.archiva.repository.content.maven2,org.apache.archiva.repository.maven"/> - + <context:component-scan base-package="org.apache.archiva.repository.maven.metadata.storage.mock,org.apache.archiva.repository.maven.mock,org.apache.archiva.repository.maven"/> + <alias name="archivaTaskScheduler#repositoryMock" alias="archivaTaskScheduler#repository" /> </beans> \ No newline at end of file
