Set CORS-related headers before writing body for flex env support

Clément Denis · tangiel · commit 7ac5c2737652 · 2017-04-03T13:39:36.000-07:00
diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/handlers/EndpointsMethodHandler.java b/endpoints-framework/src/main/java/com/google/api/server/spi/handlers/EndpointsMethodHandler.java
@@ -111,12 +111,12 @@ public void handle(EndpointsContext context) throws IOException {
             serviceName);
         ParamReader reader = createRestParamReader(context, serializationConfig);
         ResultWriter writer = createResultWriter(context, serializationConfig);
-        systemService.invokeServiceMethod(service, endpointMethod.getMethod(), reader, writer);
         if (request.getHeader(Headers.ORIGIN) != null) {
           HttpServletResponse response = context.getResponse();
           CorsHandler.allowOrigin(request, response);
           CorsHandler.setAccessControlAllowCredentials(response);
         }
+        systemService.invokeServiceMethod(service, endpointMethod.getMethod(), reader, writer);
       } catch (Exception e) {
         // All exceptions here are unexpected, including the ServiceException that may be thrown by
         // the findService call. We return an internal server error and leave the details in the
