Author: brett
Date: Fri Jun 17 01:03:16 2005
New Revision: 191104
URL: http://svn.apache.org/viewcvs?rev=191104&view=rev
Log:
avoid NPE when no settings.xml file
Modified:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Modified:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=191104&r1=191103&r2=191104&view=diff
==============================================================================
---
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(original)
+++
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Fri Jun 17 01:03:16 2005
@@ -87,9 +87,9 @@
settings = modelReader.read( reader );
RuntimeInfo rtInfo = new RuntimeInfo( settings );
-
+
rtInfo.setFile( settingsFile );
-
+
settings.setRuntimeInfo( rtInfo );
}
finally
@@ -110,6 +110,7 @@
if ( userSettings == null )
{
userSettings = new Settings();
+ userSettings.setRuntimeInfo( new RuntimeInfo( userSettings ) );
}
SettingsUtils.merge( userSettings, globalSettings,
TrackableBase.GLOBAL_LEVEL );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
