Return-Path: Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 23494 invoked by uid 500); 29 Jun 2003 02:14:20 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 23483 invoked by uid 500); 29 Jun 2003 02:14:19 -0000 Received: (qmail 23480 invoked from network); 29 Jun 2003 02:14:19 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 29 Jun 2003 02:14:19 -0000 Received: (qmail 41134 invoked by uid 1438); 29 Jun 2003 02:14:18 -0000 Date: 29 Jun 2003 02:14:18 -0000 Message-ID: <20030629021418.41133.qmail@icarus.apache.org> From: mcconnell@apache.org To: avalon-sandbox-cvs@apache.org Subject: cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl FileRepository.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N mcconnell 2003/06/28 19:14:18 Modified: merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl FileRepository.java Log: Correct a small but significant bug in the repository. Revision Changes Path 1.7 +15 -2 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl/FileRepository.java Index: FileRepository.java =================================================================== RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl/FileRepository.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FileRepository.java 27 Jun 2003 23:18:34 -0000 1.6 +++ FileRepository.java 29 Jun 2003 02:14:18 -0000 1.7 @@ -279,6 +279,19 @@ final String group, final String name, final String version, final String type ) throws RepositoryException { + if( group == null ) + { + throw new NullPointerException( "group" ); + } + if( name == null ) + { + throw new NullPointerException( "name" ); + } + if( type == null ) + { + throw new NullPointerException( "type" ); + } + String path = group + "/" + type + "s/" + name; if( ( version != null ) && ( version.length() != 0 ) ) { @@ -290,7 +303,7 @@ RepositoryException repositoryException = null; try { - getLocalArtifact( group, name, version, type ); + return getLocalArtifact( group, name, version, type ); } catch( RepositoryException e ) { --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org