Projects >> server >>0ca79f127192a5837d8fff0edba27bbdeb729da0

Chunk
Conflicting content
				// has already been failed or we wrote everything already.
			}
		}
<<<<<<< HEAD
=======
		
		// If the request ever failed, write an error message.
		// FIXME: This should probably check if it's a GET and send a 404.
		if(isFailed()) {
			httpResponse.setContentType("text/html");
			Writer writer = new BufferedWriter(new OutputStreamWriter(os));
			
			// Write the error response.
			try {
				writer.write(getFailureMessage()); 
			}
			catch(IOException e) {
				LOGGER.warn("Unable to write failed response message. Aborting.", e);
			}
			
			// Flush it.
			try {
				writer.flush();
			}
			catch(IOException e) {
				LOGGER.warn("Unable to flush the writer.", e);
			}
			
			// Close it.
			try {
				writer.close();
			}
			catch(IOException e) {
				LOGGER.warn("Unable to close the writer.", e);
			}
		}
>>>>>>> 1af64896d9aadb15d1e2c99dd46982c827b49f37
	}
}
Solution content
				// has already been failed or we wrote everything already.
			}
		}
	}
}
File
ImageReadRequest.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement