Author: bentmann
Date: Mon Oct 11 21:11:27 2010
New Revision: 1021509
URL: http://svn.apache.org/viewvc?rev=1021509&view=rev
Log:
o Improved error handling
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=1021509&r1=1021508&r2=1021509&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Mon Oct 11 21:11:27 2010
@@ -346,6 +346,7 @@ public class MavenProject
*/
if ( parentFile != null )
{
+ checkProjectBuildingRequest();
ProjectBuildingRequest request = new
DefaultProjectBuildingRequest( projectBuilderConfiguration );
request.setRemoteRepositories( getRemoteArtifactRepositories()
);
@@ -363,6 +364,7 @@ public class MavenProject
}
else if ( model.getParent() != null )
{
+ checkProjectBuildingRequest();
ProjectBuildingRequest request = new
DefaultProjectBuildingRequest( projectBuilderConfiguration );
request.setRemoteRepositories( getRemoteArtifactRepositories()
);
@@ -1848,6 +1850,7 @@ public class MavenProject
{
if ( getDistributionManagement() != null &&
getDistributionManagement().getRepository() != null )
{
+ checkProjectBuildingRequest();
try
{
ArtifactRepository repo =
@@ -1877,6 +1880,7 @@ public class MavenProject
{
if ( getDistributionManagement() != null &&
getDistributionManagement().getSnapshotRepository() != null )
{
+ checkProjectBuildingRequest();
try
{
ArtifactRepository repo =
@@ -2184,4 +2188,12 @@ public class MavenProject
projectBuilderConfiguration = projectBuildingRequest;
}
+ private void checkProjectBuildingRequest()
+ {
+ if ( projectBuilderConfiguration == null )
+ {
+ throw new IllegalStateException( "project building request
missing" );
+ }
+ }
+
}