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

If servletContextPath is not root (application is deployed not to the root) we should take it into consideration while determinating server base.

This commit is contained in:
petromykhailysyn 2016-01-22 10:42:36 +02:00
parent e73f409800
commit 0e3bb5a797
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
View File

@ -73,7 +73,12 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
}
String fhirServerBase;
int length = contextIndex + servletPath.length();
int length;
if (servletContextPath.length() == 0 || servletContextPath.equals("/")) {
length = contextIndex + servletPath.length();
} else {
length = contextIndex + servletPath.length() + servletContextPath.length();
}
if (length > requestUrlLength) {
length = requestUrlLength;
}