You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/08/29 20:24:22 UTC
svn commit: r570889 - in /maven/components/trunk/maven-embedder/src:
main/java/org/apache/maven/embedder/ test/java/org/apache/maven/embedder/
Author: carlos
Date: Wed Aug 29 11:24:22 2007
New Revision: 570889
URL: http://svn.apache.org/viewvc?rev=570889&view=rev
Log:
Fix bugs in previous commit
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java?rev=570889&r1=570888&r2=570889&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java Wed Aug 29 11:24:22 2007
@@ -32,13 +32,13 @@
boolean isValid();
/**
- * Parsed user settings, or null if there's any parse error, that can be retrieved through
+ * Parsed user settings. If there's any parse error, it can be retrieved through
* {@link #getUserSettingsException()}
*/
Settings getUserSettings();
/**
- * Parsed global settings, or null if there's any parse error, that can be retrieved through
+ * Parsed global settings. If there's any parse error, it can be retrieved through
* {@link #getGlobalSettingsException()}
*/
Settings getGlobalSettings();
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java?rev=570889&r1=570888&r2=570889&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java Wed Aug 29 11:24:22 2007
@@ -37,7 +37,7 @@
public boolean isValid()
{
- return ( getUserSettings() != null ) && ( getGlobalSettings() != null );
+ return ( getUserSettingsException() == null ) && ( getGlobalSettingsException() == null );
}
public Throwable getUserSettingsException()
@@ -87,7 +87,7 @@
public boolean isGlobalSettingsFilePresent()
{
- return getGlobalSettingsException() instanceof FileNotFoundException;
+ return isSettingsFilePresent( getGlobalSettings(), getGlobalSettingsException() );
}
public boolean isUserSettingsFileParses()
@@ -97,7 +97,7 @@
public boolean isUserSettingsFilePresent()
{
- return getUserSettingsException() instanceof FileNotFoundException;
+ return isSettingsFilePresent( getUserSettings(), getUserSettingsException() );
}
public void setGlobalSettingsFileParses( boolean globalSettingsFileParses )
@@ -123,5 +123,10 @@
public void display()
{
// ignored
+ }
+
+ private boolean isSettingsFilePresent( Settings settings, Throwable e )
+ {
+ return ( settings != null ) || ( ( e != null ) && !( e instanceof FileNotFoundException ) );
}
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=570889&r1=570888&r2=570889&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Aug 29 11:24:22 2007
@@ -754,7 +754,10 @@
{
try
{
- fileReader.close();
+ if ( fileReader != null )
+ {
+ fileReader.close();
+ }
}
catch ( IOException e )
{
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java?rev=570889&r1=570888&r2=570889&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java Wed Aug 29 11:24:22 2007
@@ -60,7 +60,7 @@
File global = new File( getBasedir(), "src/test/resources/settings/valid-settings.xml" );
Configuration configuration = new DefaultConfiguration()
- .setUserSettingsFile( global );
+ .setGlobalSettingsFile( global );
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );