From: olivier lamy <olamy@apache.org>
Date: Sat, 2 Sep 2017 08:56:07 +0000 (+1000)
Subject: avoid npe
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6abccf351093647c55212e5412188683ed2c9832;p=archiva.git

avoid npe

Signed-off-by: olivier lamy <olamy@apache.org>
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
index 2137bfb39..9d8a114b3 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
@@ -431,7 +431,7 @@ limitations under the License.
       <ul>
       [#list resourceGroup.resources?sort_by("path") as resource]
 [#list resource.methods as method]
-<li><a href="#${method.slug}">${apiRelativePath}${resourceGroup.contextPath}${resource.path}</a></li>
+        <li><a href="#${method.slug}">${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}</a></li>
 [/#list]
       [/#list]
       </ul>
@@ -452,7 +452,7 @@ limitations under the License.
         [#list resource.methods as method]
 
       <div id="${method.slug}">
-        <h2>${method.label} <small>${resource.path} <a href="${apiRelativePath}${resourceGroup.contextPath}${resource.path}" class="glyphicon glyphicon-new-window" target="_blank"></a></small></h2>
+        <h2>${method.label} <small>${resource.path} <a href="${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}" class="glyphicon glyphicon-new-window" target="_blank"></a></small></h2>
           [#if resourceGroup.deprecated?? || method.deprecated??]
 
         <div class="alert alert-danger">This method has been deprecated. [#if method.deprecated??] ${method.deprecated!""}[#else] ${resource.deprecated!""}[/#if]</div>
@@ -934,4 +934,4 @@ limitations under the License.
   [#else]
 ${metaValue}
   [/#if]
-[/#macro]
\ No newline at end of file
+[/#macro]
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
index 2137bfb39..e1f2d8430 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
+++ b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
@@ -431,7 +431,7 @@ limitations under the License.
       <ul>
       [#list resourceGroup.resources?sort_by("path") as resource]
 [#list resource.methods as method]
-<li><a href="#${method.slug}">${apiRelativePath}${resourceGroup.contextPath}${resource.path}</a></li>
+<li><a href="#${method.slug}">${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}</a></li>
 [/#list]
       [/#list]
       </ul>
@@ -452,7 +452,7 @@ limitations under the License.
         [#list resource.methods as method]
 
       <div id="${method.slug}">
-        <h2>${method.label} <small>${resource.path} <a href="${apiRelativePath}${resourceGroup.contextPath}${resource.path}" class="glyphicon glyphicon-new-window" target="_blank"></a></small></h2>
+        <h2>${method.label} <small>${resource.path} <a href="${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}" class="glyphicon glyphicon-new-window" target="_blank"></a></small></h2>
           [#if resourceGroup.deprecated?? || method.deprecated??]
 
         <div class="alert alert-danger">This method has been deprecated. [#if method.deprecated??] ${method.deprecated!""}[#else] ${resource.deprecated!""}[/#if]</div>