From c25f765fc5c3bba02aa375ed04df67caa72af88f Mon Sep 17 00:00:00 2001 From: guyben Date: Fri, 11 May 2018 08:31:25 -0700 Subject: [PATCH] Set the MIME type BEFORE the payload When we set the payload, it is converted to bytes using the response's character set. Changing the MIME type later has no effect on the conversion to bytes, even though it does change the returned MIME type. This results in bytes that were encoded using one character set while the response reports a different character set. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=196258752 --- java/google/registry/flows/EppRequestHandler.java | 2 +- javatests/google/registry/testing/FakeResponse.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/google/registry/flows/EppRequestHandler.java b/java/google/registry/flows/EppRequestHandler.java index fa8b5e021..3ad1831ea 100644 --- a/java/google/registry/flows/EppRequestHandler.java +++ b/java/google/registry/flows/EppRequestHandler.java @@ -52,8 +52,8 @@ public class EppRequestHandler { EppOutput eppOutput = eppController.handleEppCommand( sessionMetadata, credentials, eppRequestSource, isDryRun, isSuperuser, inputXmlBytes); - response.setPayload(new String(marshalWithLenientRetry(eppOutput), UTF_8)); response.setContentType(APPLICATION_EPP_XML); + response.setPayload(new String(marshalWithLenientRetry(eppOutput), UTF_8)); // Note that we always return 200 (OK) even if the EppController returns an error response. // This is because returning a non-OK HTTP status code will cause the proxy server to // silently close the connection without returning any data. The only time we will ever return diff --git a/javatests/google/registry/testing/FakeResponse.java b/javatests/google/registry/testing/FakeResponse.java index 775ecb2e5..19d4e5d0f 100644 --- a/javatests/google/registry/testing/FakeResponse.java +++ b/javatests/google/registry/testing/FakeResponse.java @@ -60,6 +60,7 @@ public final class FakeResponse implements Response { @Override public void setContentType(MediaType contentType) { + checkArgument(payload.isEmpty(), "setContentType must be called before setPayload"); this.contentType = checkNotNull(contentType); }