honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2883] Resolve threads

This commit is contained in:
katie_smilecdr 2021-08-16 10:56:13 -04:00
parent 36d2a8f3ce
commit 62026d4caf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java
View File

@ -268,7 +268,7 @@ public class OpenApiInterceptor {
} }
public String removeTrailingSlash(String theUrl) { public String removeTrailingSlash(String theUrl) {
while(theUrl.endsWith("/")) { while(theUrl != null && theUrl.endsWith("/")) {
theUrl = theUrl.substring(0, theUrl.length() - 1); theUrl = theUrl.substring(0, theUrl.length() - 1);
} }
return theUrl; return theUrl;
@ -288,7 +288,7 @@ public class OpenApiInterceptor {
context.setVariable("DESCRIPTION", cs.getImplementation().getDescription()); context.setVariable("DESCRIPTION", cs.getImplementation().getDescription());
context.setVariable("SERVER_NAME", cs.getSoftware().getName()); context.setVariable("SERVER_NAME", cs.getSoftware().getName());
context.setVariable("SERVER_VERSION", cs.getSoftware().getVersion()); context.setVariable("SERVER_VERSION", cs.getSoftware().getVersion());
context.setVariable("BASE_URL", baseUrl); context.setVariable("BASE_URL", cs.getImplementation().getUrl());
context.setVariable("BANNER_IMAGE_URL", getBannerImage()); context.setVariable("BANNER_IMAGE_URL", getBannerImage());
context.setVariable("OPENAPI_DOCS", baseUrl + "/api-docs"); context.setVariable("OPENAPI_DOCS", baseUrl + "/api-docs");
context.setVariable("FHIR_VERSION", cs.getFhirVersion().toCode()); context.setVariable("FHIR_VERSION", cs.getFhirVersion().toCode());