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

Fix build problem

This commit is contained in:
James Agnew 2015-03-11 22:31:20 -04:00
parent df3c812fb8
commit 7f9b1baa14
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
View File

@ -496,7 +496,7 @@ public class RestfulServer extends HttpServlet {
String fhirServerBase = null; String fhirServerBase = null;
boolean requestIsBrowser = requestIsBrowser(theRequest); boolean requestIsBrowser = requestIsBrowser(theRequest);
RequestDetails requestDetails = null; Request requestDetails = null;
try { try {
String resourceName = null; String resourceName = null;
@ -622,31 +622,31 @@ public class RestfulServer extends HttpServlet {
} }
} }
Request r = new Request(); requestDetails = new Request();
r.setServer(this); requestDetails.setServer(this);
r.setResourceName(resourceName); requestDetails.setResourceName(resourceName);
r.setId(id); requestDetails.setId(id);
r.setOperation(operation); requestDetails.setOperation(operation);
r.setSecondaryOperation(secondaryOperation); requestDetails.setSecondaryOperation(secondaryOperation);
r.setParameters(params); requestDetails.setParameters(params);
r.setRequestType(theRequestType); requestDetails.setRequestType(theRequestType);
r.setFhirServerBase(fhirServerBase); requestDetails.setFhirServerBase(fhirServerBase);
r.setCompleteUrl(completeUrl); requestDetails.setCompleteUrl(completeUrl);
r.setServletRequest(theRequest); requestDetails.setServletRequest(theRequest);
r.setServletResponse(theResponse); requestDetails.setServletResponse(theResponse);
r.setRespondGzip(respondGzip); requestDetails.setRespondGzip(respondGzip);
r.setCompartmentName(compartment); requestDetails.setCompartmentName(compartment);
String pagingAction = theRequest.getParameter(Constants.PARAM_PAGINGACTION); String pagingAction = theRequest.getParameter(Constants.PARAM_PAGINGACTION);
if (getPagingProvider() != null && isNotBlank(pagingAction)) { if (getPagingProvider() != null && isNotBlank(pagingAction)) {
r.setOtherOperationType(OtherOperationTypeEnum.GET_PAGE); requestDetails.setOtherOperationType(OtherOperationTypeEnum.GET_PAGE);
handlePagingRequest(r, theResponse, pagingAction); handlePagingRequest(requestDetails, theResponse, pagingAction);
return; return;
} }
if (resourceMethod == null) { if (resourceMethod == null) {
if (resourceBinding != null) { if (resourceBinding != null) {
resourceMethod = resourceBinding.getMethod(r); resourceMethod = resourceBinding.getMethod(requestDetails);
} }
} }
if (resourceMethod == null) { if (resourceMethod == null) {
@ -661,7 +661,7 @@ public class RestfulServer extends HttpServlet {
throw new InvalidRequestException(b.toString()); throw new InvalidRequestException(b.toString());
} }
requestDetails = r; requestDetails = requestDetails;
requestDetails.setResourceOperationType(resourceMethod.getResourceOperationType()); requestDetails.setResourceOperationType(resourceMethod.getResourceOperationType());
requestDetails.setSystemOperationType(resourceMethod.getSystemOperationType()); requestDetails.setSystemOperationType(resourceMethod.getSystemOperationType());
requestDetails.setOtherOperationType(resourceMethod.getOtherOperationType()); requestDetails.setOtherOperationType(resourceMethod.getOtherOperationType());
@ -674,7 +674,7 @@ public class RestfulServer extends HttpServlet {
} }
} }
resourceMethod.invokeServer(this, r); resourceMethod.invokeServer(this, requestDetails);
} catch (NotModifiedException e) { } catch (NotModifiedException e) {

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
View File

@ -40,7 +40,7 @@ public class ExceptionHandlingInterceptor extends InterceptorAdapter {
@Override @Override
public boolean handleException(RequestDetails theRequestDetails, Throwable theException, HttpServletRequest theRequest, HttpServletResponse theResponse) throws ServletException, IOException { public boolean handleException(RequestDetails theRequestDetails, Throwable theException, HttpServletRequest theRequest, HttpServletResponse theResponse) throws ServletException, IOException {
ourLog.error("AA", theException);
BaseOperationOutcome oo = null; BaseOperationOutcome oo = null;
int statusCode = Constants.STATUS_HTTP_500_INTERNAL_ERROR; int statusCode = Constants.STATUS_HTTP_500_INTERNAL_ERROR;