From 97a37e6c2fa53880f4da05cd5d87e154528db9ac Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Wed, 18 Aug 2004 07:28:10 +0000 Subject: [PATCH] Fix userModel loading. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162990 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/project/DefaultMavenProjectBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 31cf23a49c..95f4b74b7e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -137,7 +137,7 @@ public class DefaultMavenProjectBuilder previous = current; } - if ( userModelFile != null ) + if ( userModel != null ) { modelInheritanceAssembler.assembleModelInheritance( userModel, previous );