Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 19231 invoked from network); 18 Mar 2006 10:20:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Mar 2006 10:20:09 -0000 Received: (qmail 95256 invoked by uid 500); 18 Mar 2006 10:20:08 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 95157 invoked by uid 500); 18 Mar 2006 10:20:07 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 95145 invoked by uid 99); 18 Mar 2006 10:20:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Mar 2006 02:20:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 18 Mar 2006 02:20:06 -0800 Received: (qmail 19053 invoked by uid 65534); 18 Mar 2006 10:19:46 -0000 Message-ID: <20060318101946.19052.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r386835 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Date: Sat, 18 Mar 2006 10:19:45 -0000 To: commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Sat Mar 18 02:19:43 2006 New Revision: 386835 URL: http://svn.apache.org/viewcvs?rev=386835&view=rev Log: fix NPE Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=386835&r1=386834&r2=386835&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Sat Mar 18 02:19:43 2006 @@ -691,7 +691,7 @@ if ( menu.getItems().isEmpty() ) { List categoryReports = (List) categories.get( MavenReport.CATEGORY_PROJECT_INFORMATION ); - if ( !categoryReports.isEmpty() ) + if ( !isEmptyList( categoryReports ) ) { MenuItem item = createCategoryMenu( i18n.getString( "site-plugin", locale, "report.menu.projectinformation" ), "/project-info.html", @@ -701,7 +701,7 @@ } categoryReports = (List) categories.get( MavenReport.CATEGORY_PROJECT_REPORTS ); - if ( !categoryReports.isEmpty() ) + if ( !isEmptyList( categoryReports ) ) { MenuItem item = createCategoryMenu( i18n.getString( "site-plugin", locale, "report.menu.projectreports" ), "/project-reports.html", @@ -852,5 +852,10 @@ } } return documents; + } + + private static boolean isEmptyList( List list ) + { + return list == null || list.isEmpty(); } }