jvanzyl 2003/12/09 19:27:58
Modified: maven-project/src/java/org/apache/maven/project
DefaultProjectBuilder.java
Log:
o remove the caching because of course ... optimization is the root of all evil.
i just spent two hours trying to get recursive inheritance working and it
was a flaw in the selection of the key to use in the cache. [EMAIL PROTECTED]@#$%.
Revision Changes Path
1.18 +3 -13
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultProjectBuilder.java 9 Dec 2003 06:21:34 -0000 1.17
+++ DefaultProjectBuilder.java 10 Dec 2003 03:27:58 -0000 1.18
@@ -30,9 +30,6 @@
extends AbstractLogEnabled
implements ProjectBuilder, Serviceable
{
- /** Map of loaded POMs. */
- private static HashMap parentPoms = new HashMap();
-
/** Project marshaller. */
private ModelMarshaller marshaller;
@@ -76,7 +73,7 @@
try
{
model = unmarshaller.parse( reader );
-
+
project.setModelSource( projectDescriptor.toURL() );
project.setModel( model );
@@ -101,16 +98,9 @@
File parentModel = new File( modelToExtend );
- Project parent = (Project) parentPoms.get(
parentModel.getCanonicalPath() );
-
- if ( parent == null )
- {
- parent = build( parentModel );
-
- parentPoms.put( parentModel.getCanonicalPath(), parent );
+ Project parent = build( parentModel );
- project.setParent( parent );
- }
+ project.setParent( parent );
setupModelInheritance( project.getModel(), parent.getModel() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
