You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/12/27 10:40:49 UTC
svn commit: r359196 -
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
Author: fgiust
Date: Tue Dec 27 01:40:44 2005
New Revision: 359196
URL: http://svn.apache.org/viewcvs?rev=359196&view=rev
Log:
avoid rewriting the settings file if it had additional entries
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java?rev=359196&r1=359195&r2=359196&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java Tue Dec 27 01:40:44 2005
@@ -91,14 +91,15 @@
{
oldCoreSettingsFile = coreSettingsFile;
- Properties props = new Properties();
+ Properties oldsettings = new Properties();
+ oldsettings.load( new FileInputStream( oldCoreSettingsFile ) );
- props.load( new FileInputStream( oldCoreSettingsFile ) );
- props.putAll( coreSettings );
+ Properties newsettings = (Properties) oldsettings.clone();
+ newsettings.putAll( coreSettings );
- if ( !props.equals( coreSettings ) )
+ if ( !oldsettings.equals( newsettings ) )
{
- props.store( new FileOutputStream( coreSettingsFile ), null );
+ newsettings.store( new FileOutputStream( coreSettingsFile ), null );
}
}
else