avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/extension/spi/src/java/org/apache/avalon/extension Extension.java
Date Mon, 15 Dec 2003 18:06:34 GMT
mcconnell    2003/12/15 10:06:34

  Modified:    merlin/extension/spi project.xml
               merlin/extension/spi/src/java/org/apache/avalon/extension
                        Extension.java
  Log:
  Add check for a null manifest and bump package version.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon/merlin/extension/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/extension/spi/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:32:38 -0000	1.1
  +++ project.xml	15 Dec 2003 18:06:33 -0000	1.2
  @@ -5,7 +5,7 @@
     <groupId>avalon-extension</groupId>
     <id>avalon-extension-spi</id>
     <name>Avalon Extension SPI</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Extension Management SPI</shortDescription>
     <gumpRepositoryId>avalon-extension-spi</gumpRepositoryId>
  
  
  
  1.3       +4 -1      avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/Extension.java
  
  Index: Extension.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/Extension.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Extension.java	5 Dec 2003 15:13:04 -0000	1.2
  +++ Extension.java	15 Dec 2003 18:06:34 -0000	1.3
  @@ -674,6 +674,9 @@
       private static Extension[] getListed( final Manifest manifest,
                                             final Attributes.Name listKey )
       {
  +        if( null == manifest )
  +          return new Extension[0];
  + 
           final ArrayList results = new ArrayList();
           final Attributes mainAttributes = manifest.getMainAttributes();
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message