cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/project Project.java

[jvanzyl]

jvanzyl     2002/06/02 10:16:02

  Modified:    src/java/org/apache/maven ProjectProperties.java
               src/java/org/apache/maven/project Project.java
  Log:
  Guard against the <repository> element not being present.
  
  Revision  Changes    Path
  1.42      +2 -3      
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
  
  Index: ProjectProperties.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ProjectProperties.java    1 Jun 2002 22:01:36 -0000       1.41
  +++ ProjectProperties.java    2 Jun 2002 17:16:02 -0000       1.42
  @@ -86,7 +86,7 @@
    *
    * @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
  - * @version $Id: ProjectProperties.java,v 1.41 2002/06/01 22:01:36 jvanzyl Exp $
  + * @version $Id: ProjectProperties.java,v 1.42 2002/06/02 17:16:02 jvanzyl Exp $
    */
   public class ProjectProperties
       extends ProjectExecutor
  @@ -253,8 +253,7 @@
               
               if (value.length() > 0 && getProject().getProperty(key) == null)
               {
  -                getProject().setProperty("maven." + key,
  -                    (String) values.get(key));
  +                getProject().setProperty("maven." + key, value);
               }                
           }
       }
  
  
  
  1.22      +11 -1     
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Project.java      1 Jun 2002 23:30:31 -0000       1.21
  +++ Project.java      2 Jun 2002 17:16:02 -0000       1.22
  @@ -65,7 +65,7 @@
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
  - * @version $Id: Project.java,v 1.21 2002/06/01 23:30:31 jvanzyl Exp $
  + * @version $Id: Project.java,v 1.22 2002/06/02 17:16:02 jvanzyl Exp $
    */
   public class Project
        extends BaseObject
  @@ -480,6 +480,11 @@
        */
       public String getCvsModule()
       {
  +        if (getRepository() == null)
  +        {
  +            return null;
  +        }
  +        
           return getRepository().getCvsModule();
       }
   
  @@ -488,6 +493,11 @@
        */
       public String getCvsRoot()
       {
  +        if (getRepository() == null)
  +        {
  +            return null;
  +        }
  +        
           return getRepository().getCvsRoot();
       }
   
  
  
  

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