Author: bentmann Date: Fri Dec 26 09:55:13 2008 New Revision: 729517 URL: http://svn.apache.org/viewvc?rev=729517&view=rev Log: o Fixed file checks
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java?rev=729517&r1=729516&r2=729517&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java Fri Dec 26 09:55:13 2008 @@ -50,7 +50,7 @@ ProfilesRoot profilesRoot = null; - if ( profilesXml.exists() ) + if ( profilesXml.isFile() ) { getLogger().debug( "reading: " + profilesXml.getAbsolutePath() ); Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=729517&r1=729516&r2=729517&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java Fri Dec 26 09:55:13 2008 @@ -153,7 +153,7 @@ public boolean isPomInBuild() { - return projectDirectory != null && new File(projectDirectory, "pom.xml").exists(); + return projectDirectory != null && new File(projectDirectory, "pom.xml").isFile(); } /** Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=729517&r1=729516&r2=729517&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Fri Dec 26 09:55:13 2008 @@ -220,7 +220,7 @@ f = new File( f, "pom.xml" ); } - return f.exists(); + return f.isFile(); } catch ( IOException e ) { @@ -290,7 +290,7 @@ parentFile = new File( parentFile.getAbsolutePath(), "pom.xml" ); } - if ( !parentFile.exists() ) + if ( !parentFile.isFile() ) { throw new IOException( "File does not exist: File = " + parentFile.getAbsolutePath() ); }