svn commit: r517275 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

[dkulp]

Author: dkulp
Date: Mon Mar 12 09:34:47 2007
New Revision: 517275

URL: http://svn.apache.org/viewvc?view=rev&rev=517275
Log:
Fix problem with not actually using suppression file


Modified:
    
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?view=diff&rev=517275&r1=517274&r2=517275
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
 Mon Mar 12 09:34:47 2007
@@ -571,6 +571,7 @@
                 CheckstyleResults results;
 
                 moduleFactory = getModuleFactory();
+                
                 config = ConfigurationLoader.loadConfiguration( configFile,
                                                                 new 
PropertiesExpander( overridingProperties ) );
                 results = executeCheckstyle( config, moduleFactory );
@@ -776,7 +777,7 @@
         }
 
         FilterSet filterSet = getSuppressions();
-
+        
         Checker checker = new Checker();
 
         // setup classloader, needed to avoid "Unable to get class information
@@ -1090,15 +1091,10 @@
     private FilterSet getSuppressions()
         throws MavenReportException
     {
-        if ( suppressionsFileExpression != null )
-        {
-            return null;
-        }
-
         try
         {
             File suppressionsFile = locator.resolveLocation( 
suppressionsLocation, "checkstyle-suppressions.xml" );
-
+            
             if ( suppressionsFile == null )
             {
                 return null;