You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/12/23 15:36:29 UTC
svn commit: r728971 - in /maven/enforcer/trunk/enforcer-rules/src:
main/java/org/apache/maven/plugins/enforcer/
test/java/org/apache/maven/plugins/enforcer/
Author: brett
Date: Tue Dec 23 06:36:29 2008
New Revision: 728971
URL: http://svn.apache.org/viewvc?rev=728971&view=rev
Log:
[MENFORCER-56] handle empty filenames
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java?rev=728971&r1=728970&r2=728971&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java Tue Dec 23 06:36:29 2008
@@ -87,7 +87,15 @@
Iterator iter = failures.iterator();
while ( iter.hasNext() )
{
- buf.append( ( (File) ( iter.next() ) ).getAbsolutePath() + "\n" );
+ File file = (File) iter.next();
+ if ( file != null )
+ {
+ buf.append( file.getAbsolutePath() + "\n" );
+ }
+ else
+ {
+ buf.append( "(an empty filename was given)\n" );
+ }
}
throw new EnforcerRuleException( buf.toString() );
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java?rev=728971&r1=728970&r2=728971&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java Tue Dec 23 06:36:29 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.plugins.enforcer;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,11 +18,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugins.enforcer;
import java.io.File;
-// TODO: Auto-generated Javadoc
/**
* The Class RequireFilesExist.
*/
@@ -35,7 +35,7 @@
*/
boolean checkFile( File file )
{
- return file.exists();
+ return file == null ? false : file.exists();
}
/*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java?rev=728971&r1=728970&r2=728971&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java Tue Dec 23 06:36:29 2008
@@ -49,6 +49,22 @@
f.delete();
}
+ public void testEmptyFile()
+ throws EnforcerRuleException, IOException
+ {
+ rule.files = new File[] { null };
+
+ try
+ {
+ rule.execute( EnforcerTestUtils.getHelper() );
+ fail( "Should get exception" );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ assertTrue( true );
+ }
+ }
+
public void testFileDoesNotExist()
throws EnforcerRuleException, IOException
{