From 4286b4eb713bb3b9ad58a94f439688735d06ad61 Mon Sep 17 00:00:00 2001 From: aheritier Date: Fri, 18 Mar 2005 23:12:17 +0000 Subject: [PATCH] MPXDOC-136 : NullPointerException with optionals pom items missing git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@158161 13f79535-47bb-0310-9956-ffa450edef68 --- xdoc/src/plugin-resources/templates/cvs-usage.xml | 5 ++--- xdoc/src/plugin-resources/templates/issue-tracking.xml | 2 ++ xdoc/src/plugin-resources/templates/scm/cvs.xml | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml index b625963b..229c59e0 100644 --- a/xdoc/src/plugin-resources/templates/cvs-usage.xml +++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml @@ -34,10 +34,9 @@

#else - - #set ($url = $escape.getText($repository.url)) - + #if ($repository.url && $repository.url != '') + #set ($url = $escape.getText($repository.url))

$url diff --git a/xdoc/src/plugin-resources/templates/issue-tracking.xml b/xdoc/src/plugin-resources/templates/issue-tracking.xml index 41b4f347..eb5ed36d 100644 --- a/xdoc/src/plugin-resources/templates/issue-tracking.xml +++ b/xdoc/src/plugin-resources/templates/issue-tracking.xml @@ -26,8 +26,10 @@

+ #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '') #set ($url = $escape.getText($project.issueTrackingUrl)) $url + #end

diff --git a/xdoc/src/plugin-resources/templates/scm/cvs.xml b/xdoc/src/plugin-resources/templates/scm/cvs.xml index cb1bbf06..4c9ef686 100644 --- a/xdoc/src/plugin-resources/templates/scm/cvs.xml +++ b/xdoc/src/plugin-resources/templates/scm/cvs.xml @@ -34,10 +34,9 @@

#else - - #set ($url = $escape.getText($repository.url)) - + #if ($repository.url && $repository.url != '') + #set ($url = $escape.getText($repository.url))

$url