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

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

This reverts commit 0e3bb5a797.
This commit is contained in:
petromykhailysyn 2016-01-26 17:02:24 +02:00
parent 83823aad35
commit a7313023f7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,9 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
} else { } else {
//servletContextPath can start with servletPath //servletContextPath can start with servletPath
contextIndex = requestUrl.indexOf(servletPath + "/", startOfPath); contextIndex = requestUrl.indexOf(servletPath + "/", startOfPath);
if (contextIndex == -1) {
contextIndex = requestUrl.indexOf(servletPath, startOfPath);
}
} }
String fhirServerBase; String fhirServerBase;