dion 2004/01/28 18:46:29
Modified: src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Project.java UnitTest.java Build.java
Log:
Handle null parent elements
Revision Changes Path
No revision
No revision
1.91.4.8 +6 -4 maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.91.4.7
retrieving revision 1.91.4.8
diff -u -r1.91.4.7 -r1.91.4.8
--- Project.java 26 Jan 2004 23:32:27 -0000 1.91.4.7
+++ Project.java 29 Jan 2004 02:46:29 -0000 1.91.4.8
@@ -299,7 +299,7 @@
/**
* Set the artifactId for this project. This is used to produce distributable
* artifacts.
- *
+ *
* @param artifactId The artifactId.
*/
public void setArtifactId( String artifactId )
@@ -309,7 +309,7 @@
/**
* Get the artifact id.
- *
+ *
* @return The artifactId
*/
public String getArtifactId()
@@ -339,7 +339,7 @@
* We want each Jelly tag lib to have a group id of 'commons-jelly' because we
* want the resultant artifact to be of the form 'commons-jelly-X' where X is
the
* id of the individual tag lib.
- *
+ *
* @return Project group id.
*/
public String getGroupId()
@@ -1505,6 +1505,8 @@
*/
public void mergeParent( Project parent )
{
+ if (parent == null) return;
+
setParent( parent );
if ( repository == null )
1.11.10.5 +5 -6 maven/src/java/org/apache/maven/project/UnitTest.java
Index: UnitTest.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/UnitTest.java,v
retrieving revision 1.11.10.4
retrieving revision 1.11.10.5
diff -u -r1.11.10.4 -r1.11.10.5
--- UnitTest.java 28 Jan 2004 13:41:59 -0000 1.11.10.4
+++ UnitTest.java 29 Jan 2004 02:46:29 -0000 1.11.10.5
@@ -157,11 +157,10 @@
*/
void mergeParent(UnitTest parent)
{
- if (parent != null)
- {
- Project.mergeLists(parent.resources, resources);
- Project.mergeLists(parent.includes, includes);
- Project.mergeLists(parent.excludes, excludes);
- }
+ if (parent == null) return;
+
+ Project.mergeLists(parent.resources, resources);
+ Project.mergeLists(parent.includes, includes);
+ Project.mergeLists(parent.excludes, excludes);
}
}
1.24.4.5 +3 -1 maven/src/java/org/apache/maven/project/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
retrieving revision 1.24.4.4
retrieving revision 1.24.4.5
diff -u -r1.24.4.4 -r1.24.4.5
--- Build.java 26 Jan 2004 23:36:09 -0000 1.24.4.4
+++ Build.java 29 Jan 2004 02:46:29 -0000 1.24.4.5
@@ -359,6 +359,8 @@
*/
void mergeParent(Build parent)
{
+ if (parent == null) return;
+
if (sourceDirectory == null)
{
sourceDirectory = parent.sourceDirectory;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]