Author: evenisse
Date: Thu Mar 8 06:26:51 2007
New Revision: 516052
URL: http://svn.apache.org/viewvc?view=rev&rev=516052
Log:
[CONTINUUM-1203] Fix NPE when the config file doesn't exist in user directory
Modified:
maven/shared/trunk/maven-app-configuration/model/pom.xml
maven/shared/trunk/maven-app-configuration/model/src/main/java/org/apache/maven/shared/app/configuration/DefaultMavenAppConfiguration.java
maven/shared/trunk/maven-app-configuration/web/pom.xml
Modified: maven/shared/trunk/maven-app-configuration/model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-app-configuration/model/pom.xml?view=diff&rev=516052&r1=516051&r2=516052
==============================================================================
--- maven/shared/trunk/maven-app-configuration/model/pom.xml (original)
+++ maven/shared/trunk/maven-app-configuration/model/pom.xml Thu Mar 8
06:26:51 2007
@@ -12,6 +12,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-15-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -32,12 +33,12 @@
<dependency>
<groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-17</version>
+ <version>1.0-alpha-18</version>
</dependency>
</dependencies>
</project>
Modified:
maven/shared/trunk/maven-app-configuration/model/src/main/java/org/apache/maven/shared/app/configuration/DefaultMavenAppConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-app-configuration/model/src/main/java/org/apache/maven/shared/app/configuration/DefaultMavenAppConfiguration.java?view=diff&rev=516052&r1=516051&r2=516052
==============================================================================
---
maven/shared/trunk/maven-app-configuration/model/src/main/java/org/apache/maven/shared/app/configuration/DefaultMavenAppConfiguration.java
(original)
+++
maven/shared/trunk/maven-app-configuration/model/src/main/java/org/apache/maven/shared/app/configuration/DefaultMavenAppConfiguration.java
Thu Mar 8 06:26:51 2007
@@ -65,7 +65,11 @@
public void save( Configuration configuration )
throws RegistryException
{
- Registry section = registry.getSection( KEY );
+ Registry section = registry.getSection( KEY + ".user" );
+ if ( section == null )
+ {
+ section = registry.getSection( KEY + ".base" );
+ }
new ConfigurationRegistryWriter().write( configuration, section );
section.save();
@@ -74,8 +78,16 @@
public void addChangeListener( RegistryListener listener )
{
- Registry section = registry.getSection( KEY );
- section.addChangeListener( listener );
+ Registry section = registry.getSection( KEY + ".user" );
+ if ( section != null )
+ {
+ section.addChangeListener( listener );
+ }
+ section = registry.getSection( KEY + ".base" );
+ if ( section != null )
+ {
+ section.addChangeListener( listener );
+ }
}
public void initialize()
Modified: maven/shared/trunk/maven-app-configuration/web/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-app-configuration/web/pom.xml?view=diff&rev=516052&r1=516051&r2=516052
==============================================================================
--- maven/shared/trunk/maven-app-configuration/web/pom.xml (original)
+++ maven/shared/trunk/maven-app-configuration/web/pom.xml Thu Mar 8 06:26:51
2007
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-17</version>
+ <version>1.0-alpha-18</version>
<scope>test</scope>
</dependency>
</dependencies>
