Projects >> thundr >>7f0a2f6a1702fe3322d26d362eb148e28627a2a1

Chunk
Conflicting content
		// noop
	}

<<<<<<< HEAD
	private String getReasonForHttpStatus(int sc) {
		StatusCode fromCode = StatusCode.fromCode(sc);
		return fromCode == null ? null : fromCode.getReason();
	}

=======
	private ByteArrayOutputStream getResponseContentInternal() {
		try {
			if (writer != null) {
				writer.flush();
				writer.close();
			}
			os.flush();
			return baos;
		} catch (IOException e) {
			throw new BaseException(e, "Failed to get output, could not flush a ByteArrayOutputStream!: ", e.getMessage());
		}
	}
>>>>>>> a80a9e382f055dfa6cccb638175e5edec9f2d564
}
Solution content
		// noop
	}

	private String getReasonForHttpStatus(int sc) {
		StatusCode fromCode = StatusCode.fromCode(sc);
		return fromCode == null ? null : fromCode.getReason();
	}

	private ByteArrayOutputStream getResponseContentInternal() {
		try {
			if (writer != null) {
				writer.flush();
				writer.close();
			}
			os.flush();
			return baos;
		} catch (IOException e) {
			throw new BaseException(e, "Failed to get output, could not flush a ByteArrayOutputStream!: %s", e.getMessage());
		}
	}
}
File
SyntheticHttpServletResponse.java
Developer's decision
Manual
Kind of conflict
Method declaration