diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java index fed6e4fb..66732c9b 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java @@ -15,8 +15,6 @@ package org.springframework.amqp.rabbit.connection; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.amqp.AmqpIOException; import org.springframework.transaction.support.ResourceHolderSynchronization; import org.springframework.transaction.support.TransactionSynchronization; @@ -34,25 +32,10 @@ import com.rabbitmq.client.Channel; * well as {@link org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer}. * * @author Mark Fisher + * @author Dave Syer */ public class ConnectionFactoryUtils { - private static final Log logger = LogFactory.getLog(ConnectionFactoryUtils.class); - - /** - * Release the given Connection by closing it. - */ - public static void releaseConnection(Connection con) { - if (con == null) { - return; - } - try { - con.close(); - } catch (Throwable ex) { - logger.debug("Could not close RabbitMQ Connection", ex); - } - } - /** * Determine whether the given RabbitMQ Channel is transactional, that is, bound to the current thread by Spring's * transaction facilities. @@ -160,7 +143,7 @@ public class ConnectionFactoryUtils { return; } RabbitUtils.closeChannel(resourceHolder.getChannel()); - releaseConnection(resourceHolder.getConnection()); + RabbitUtils.closeConnection(resourceHolder.getConnection()); } public static void bindResourceToTransaction(RabbitResourceHolder resourceHolder, diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java index edc7737f..d8dc6d16 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java @@ -40,7 +40,9 @@ import com.rabbitmq.client.Channel; * Note: This is an SPI class, not intended to be used by applications. * * @author Mark Fisher - * @see RabbitTransactionManager (not yet implemented) + * @author Dave Syer + * + * @see RabbitTransactionManager * @see RabbitTemplate */ public class RabbitResourceHolder extends ResourceHolderSupport { @@ -145,7 +147,7 @@ public class RabbitResourceHolder extends ResourceHolderSupport { } } for (Connection con : this.connections) { - ConnectionFactoryUtils.releaseConnection(con); + RabbitUtils.closeConnection(con); } this.connections.clear(); this.channels.clear();