Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FDABCC33 for ; Tue, 22 May 2012 22:11:12 +0000 (UTC) Received: (qmail 69528 invoked by uid 500); 22 May 2012 22:11:12 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 69473 invoked by uid 500); 22 May 2012 22:11:12 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 69433 invoked by uid 99); 22 May 2012 22:11:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2012 22:11:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2012 22:10:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2823623889B3 for ; Tue, 22 May 2012 22:10:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1341662 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Date: Tue, 22 May 2012 22:10:29 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120522221029.2823623889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Tue May 22 22:10:28 2012 New Revision: 1341662 URL: http://svn.apache.org/viewvc?rev=1341662&view=rev Log: fix issue when no repository has been selected Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1341662&r1=1341661&r2=1341662&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Tue May 22 22:10:28 2012 @@ -630,7 +630,7 @@ public class DefaultBrowseService repositoryContentFactory.getManagedRepositoryContent( repoId ); ArchivaArtifact archivaArtifact = new ArchivaArtifact( groupId, artifactId, version, classifier, StringUtils.isEmpty( type ) ? "jar" : type, - repositoryId ); + repoId ); File file = managedRepositoryContent.toFile( archivaArtifact ); if ( file.exists() ) { @@ -684,7 +684,7 @@ public class DefaultBrowseService ArtifactDownloadInfoBuilder builder = new ArtifactDownloadInfoBuilder().forArtifactMetadata( artifact ).withManagedRepositoryContent( - repositoryContentFactory.getManagedRepositoryContent( repositoryId ) ); + repositoryContentFactory.getManagedRepositoryContent( repoId ) ); artifactDownloadInfos.add( builder.build() ); } @@ -727,7 +727,7 @@ public class DefaultBrowseService repositoryContentFactory.getManagedRepositoryContent( repoId ); ArchivaArtifact archivaArtifact = new ArchivaArtifact( groupId, artifactId, version, classifier, StringUtils.isEmpty( type ) ? "jar" : type, - repositoryId ); + repoId ); File file = managedRepositoryContent.toFile( archivaArtifact ); if ( !file.exists() ) {