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

Merge pull request #289 from petromykhailysyn/master 

ServletContextPath can start with servletPath, it should be taken into consideration
This commit is contained in:
James Agnew 2016-02-03 14:06:18 -05:00
parent 9449df7df1 a7313023f7
commit def7fc93e0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,12 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
contextIndex = requestUrl.indexOf(requestPath, startOfPath); contextIndex = requestUrl.indexOf(requestPath, startOfPath);
} }
} else { } else {
//servletContextPath can start with servletPath
contextIndex = requestUrl.indexOf(servletPath + "/", startOfPath);
if (contextIndex == -1) {
contextIndex = requestUrl.indexOf(servletPath, startOfPath); contextIndex = requestUrl.indexOf(servletPath, startOfPath);
} }
}
String fhirServerBase; String fhirServerBase;
int length = contextIndex + servletPath.length(); int length = contextIndex + servletPath.length();