cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project DefaultMavenProjectBuilder.java

[brett]

brett       2005/04/07 22:13:10

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
  Log:
  fix bad merge
  
  Revision  Changes    Path
  1.65      +1 -1      
maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  Index: DefaultMavenProjectBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- DefaultMavenProjectBuilder.java   8 Apr 2005 04:48:04 -0000       1.64
  +++ DefaultMavenProjectBuilder.java   8 Apr 2005 05:13:10 -0000       1.65
  @@ -226,7 +226,7 @@
           Model cachedModel = (Model) modelCache.get( key );
           if ( cachedModel == null )
           {
  -            modelCache.put( cacheKey, model );
  +            modelCache.put( key, model );
           }
   
           model = modelInterpolator.interpolate( model );