Projects >> spring-amqp >>6a22d0604153ae1f441b57bee8979045fb65b0d8

Chunk
Conflicting content 
	 * onMessage method.
	 * @param listener the Rabbit MessageListener to invoke
	 * @param message the received Rabbit Message
<<<<<<< HEAD
	 * @throws Exception if thrown by RAbbit API methods
=======
>>>>>>> 64d1befc3520793b0f7c3bcd6c3eb387317c32b2
	 * @see org.springframework.amqp.core.MessageListener#onMessage
	 */
	protected void doInvokeListener(MessageListener listener, Message message) {
Solution content 
	 * onMessage method.
	 * @param listener the Rabbit MessageListener to invoke
	 * @param message the received Rabbit Message
	 * @see org.springframework.amqp.core.MessageListener#onMessage
	 */
	protected void doInvokeListener(MessageListener listener, Message message) {
File
AbstractMessageListenerContainer.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	/**
	 * Perform a rollback, if appropriate.
	 * @param channel the Rabbit Channel to roll back
<<<<<<< HEAD
	 * @throws Exception in case of a rollback error
=======
>>>>>>> 64d1befc3520793b0f7c3bcd6c3eb387317c32b2
	 */
	protected void rollbackIfNecessary(Channel channel)  {
		if (this.isChannelLocallyTransacted(channel)) {
Solution content 
	/**
	 * Perform a rollback, if appropriate.
	 * @param channel the Rabbit Channel to roll back
	 * @throws Exception in case of a rollback error
	 */
	protected void rollbackIfNecessary(Channel channel)  {
		if (this.isChannelLocallyTransacted(channel)) {
File
AbstractMessageListenerContainer.java
Developer's decision
Version 1
Kind of conflict
Comment