[prev in list] [next in list] [prev in thread] [next in thread] 

List:       avalon-cvs
Subject:    cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl FileR
From:       mcconnell () apache ! org
Date:       2003-06-29 2:14:18
[Download RAW message or body]

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


[prev in list] [next in list] [prev in thread] [next in thread]