Some array logic cleanup.

application.properties

@@ -1,4 +1,5 @@
 #Grails Metadata file
-#Fri Oct 11 09:17:35 CDT 2013
+#Fri Aug 29 15:48:11 PDT 2014
 app.grails.version=2.1.1
 app.name=rabbitmq-native
+plugins.tomcat=2.1.1

src/groovy/com/budjb/rabbitmq/ConnectionContext.groovy

@@ -89,12 +89,12 @@ class ConnectionContext {
     /**
      * List of message consumers for this connection.
      */
-    List<DefaultGrailsMessageConsumerClass> consumers = []
+    List<DefaultGrailsMessageConsumerClass> consumers = new ArrayList<DefaultGrailsMessageConsumerClass>()
 
     /**
      * List of open channels in use by consumers.
      */
-    List<Channel> channels = []
+    List<Channel> channels = new ArrayList<Channel>()
 
     /**
      * Lazy-loaded connection to RabbitMQ.
@@ -199,6 +199,8 @@ class ConnectionContext {
             return
         }
 
+        stopConsumers()
+
         log.debug("closing connection to the RabbitMQ server")
         connection.close()
         connection = null
@@ -217,16 +219,16 @@ class ConnectionContext {
      * Stops all consumers associated with this connection.
      */
     public void stopConsumers() {
-        if (channels) {
+        if (channels.size()) {
             log.debug("closing RabbitMQ channels")
             channels.each { channel ->
                 if (channel.isOpen()) {
                     channel.close()
                 }
             }
-            channels = []
+            channels.clear()
         }
-        consumers = []
+        consumers.clear()
     }
 
     /**

src/groovy/com/budjb/rabbitmq/RabbitContext.groovy

@@ -38,12 +38,12 @@ class RabbitContext {
     /**
      * List of current connection contexts.
      */
-    protected List<ConnectionContext> connections = []
+    protected List<ConnectionContext> connections = new ArrayList<ConnectionContext>()
 
     /**
      * A list of registered message converters.
      */
-    public List<MessageConverter> messageConverters = []
+    public List<MessageConverter> messageConverters = new ArrayList<MessageConverter>()
 
     /**
      * Loads and initializes the configuration.
@@ -112,10 +112,10 @@ class RabbitContext {
 
         // Disconnect
         connections*.closeConnection()
-        connections = []
+        connections.clear()
 
         // Clear message converters
-        messageConverters = []
+        messageConverters.clear()
     }
 
     /**