Projects >> MapPush >>826b1a3563ab2709331a97365e48958c40ded417

Chunk
Conflicting content 
	
	@Override
	public BroadcastAction filter(AtmosphereResource atmosphereResource, Object originalMessage, Object message) {
<<<<<<< HEAD
		AtmosphereRequest request = atmosphereResource.getRequest();
=======
		HttpServletRequest request = (HttpServletRequest) atmosphereResource.getRequest();
>>>>>>> e0abe3fed03c5e9d4b91c17c6a6292b248650f8e
		logger.info("BoundsFilter triggered for client {} with message {}", request.getLocalAddr(), message);
		Event event = (Event) message;
		try {
Solution content 
	
	@Override
	public BroadcastAction filter(AtmosphereResource atmosphereResource, Object originalMessage, Object message) {
		AtmosphereRequest request = atmosphereResource.getRequest();
		logger.info("BoundsFilter triggered for client {} with message {}", request.getLocalAddr(), message);
		Event event = (Event) message;
		try {
File
BoundsFilter.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Method invocation
Variable