brett       2004/06/25 09:12:06

  Modified:    changelog/src/plugin-resources changelog.jsl
               changelog/xdocs changes.xml
  Log:
  PR: MPCHANGELOG-34
  Submitted By: Rafael Santiago, Jr.
  Reviewed By:  Brett Porter
  Avoid NPE
  
  Revision  Changes    Path
  1.8       +1 -1      maven-plugins/changelog/src/plugin-resources/changelog.jsl
  
  Index: changelog.jsl
  ===================================================================
  RCS file: /home/cvs/maven-plugins/changelog/src/plugin-resources/changelog.jsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- changelog.jsl     21 Apr 2004 00:55:43 -0000      1.7
  +++ changelog.jsl     25 Jun 2004 16:12:06 -0000      1.8
  @@ -71,7 +71,7 @@
                       <j:set var="revision"><x:expr select="$file/revision"/></j:set>
                       <j:set var="repositoryUrl" value="${pom.repository.url}"/>
                       <j:choose>
  -                      <j:when test="${repositoryUrl.indexOf('?')>0}">
  +                      <j:when test="${!empty(repositoryUrl)} and 
${repositoryUrl.indexOf('?')>0}">
                           <j:set var="repository" value="${repositoryUrl.substring(0, 
repositoryUrl.indexOf('?'))}"/>
                           <j:set var="tmpMultiRepoParam" 
value="${repositoryUrl.substring(repository.length())}"/>
                           <j:set var="oneRepoParam" 
value="?${tmpMultiRepoParam.substring(1)}"/>
  
  
  
  1.34      +1 -0      maven-plugins/changelog/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/changelog/xdocs/changes.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- changes.xml       13 Jun 2004 05:26:16 -0000      1.33
  +++ changes.xml       25 Jun 2004 16:12:06 -0000      1.34
  @@ -27,6 +27,7 @@
     <body>
       
       <release version="1.6-SNAPSHOT" date="in CVS">
  +      <action dev="brett" type="fix" issue="MPCHANGELOG-34" due-to="Rafael 
Santiago, Jr.">Prevent any NPE depending on certain repository definition 
conditions</action>
         <action dev="brett" type="fix">Build and run plugin against the installed 
version of Maven</action>
         <action dev="evenisse" type="fix" issue="MPCHANGELOG-39">Fix date format with 
clearcase.</action>
         <action dev="dion" type="update">Allow empty passwords in 
create-cvspass</action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to