You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/09/02 08:56:17 UTC
archiva git commit: avoid npe
Repository: archiva
Updated Branches:
refs/heads/master a015600d4 -> 6abccf351
avoid npe
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6abccf35
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6abccf35
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6abccf35
Branch: refs/heads/master
Commit: 6abccf351093647c55212e5412188683ed2c9832
Parents: a015600
Author: olivier lamy <ol...@apache.org>
Authored: Sat Sep 2 18:56:07 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Sep 2 18:56:07 2017 +1000
----------------------------------------------------------------------
.../archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt | 6 +++---
.../archiva-web/archiva-web-common/src/enunciate/archiva.fmt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6abccf35/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
----------------------------------------------------------------------
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 2137bfb..9d8a114 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]
http://git-wip-us.apache.org/repos/asf/archiva/blob/6abccf35/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
----------------------------------------------------------------------
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 2137bfb..e1f2d84 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>