Apply patch for: https://issues.apache.org/jira/browse/AMQ-3567

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189370 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java

@@ -364,7 +364,7 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
                   READ_CHECK_TIMER.cancel();
                     WRITE_CHECK_TIMER = null;
                     READ_CHECK_TIMER = null;
-                    ASYNC_TASKS.shutdownNow();
+                    ASYNC_TASKS.shutdown();
                     ASYNC_TASKS = null;
                 }
             }

activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3567Test.java

@@ -0,0 +1,214 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.WriterAppender;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Claudio Corsi
+ *
+ */
+public class AMQ3567Test {
+
+    private static Logger logger = LoggerFactory.getLogger(AMQ3567Test.class);
+
+    private ActiveMQConnectionFactory factory;
+    private Connection connection;
+    private Session sessionWithListener, session;
+    private Queue destination;
+    private MessageConsumer consumer;
+    private Thread thread;
+    private BrokerService broker;
+    private String connectionUri;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        startBroker();
+        initializeConsumer();
+        startConsumer();
+    }
+
+    @Test
+    public void runTest() throws Exception {
+        produceSingleMessage();
+        File file = File.createTempFile("whatever", null);
+        FileOutputStream fos = new FileOutputStream(file);
+        org.apache.log4j.Logger log4jLogger = org.apache.log4j.Logger.getLogger("org.apache.activemq.util.ServiceSupport");
+        Layout layout = new PatternLayout("%d | %-5p | %c - %m%n");
+        WriterAppender appender = new WriterAppender(layout, fos);
+        log4jLogger.addAppender(appender);
+        Level level = log4jLogger.getLevel();
+        log4jLogger.setLevel(Level.DEBUG);
+
+        BufferedReader read = null;
+
+        try {
+            stopConsumer();
+            stopBroker();
+            log4jLogger.removeAppender(appender);
+            fos.close();
+            read = new BufferedReader(new FileReader(file));
+            String line;
+
+            while ((line = read.readLine()) != null) {
+                if (line.indexOf("InterruptedException") > -1) {
+                    if (line.indexOf("Could not stop service:") > -1) {
+                        logger.info("Received an interrupted exception {}", line);
+                        fail("An Interrupt exception was generated");
+                    }
+                }
+            }
+
+        } finally {
+            log4jLogger.setLevel(level);
+
+            if (read != null)
+                read.close();
+
+            file.deleteOnExit();
+        }
+    }
+
+    private void startBroker() throws Exception {
+        broker = new BrokerService();
+        broker.setDataDirectory("target/data");
+        connectionUri = broker.addConnector("tcp://localhost:0?wireFormat.maxInactivityDuration=30000&transport.closeAsync=false&transport.threadName&soTimeout=60000&transport.keepAlive=false&transport.useInactivityMonitor=false").getPublishableConnectString();
+        broker.start(true);
+        broker.waitUntilStarted();
+    }
+
+    private void stopBroker() throws Exception {
+        broker.stop();
+        broker.waitUntilStopped();
+    }
+
+    private void initializeConsumer() throws JMSException {
+        logger.info("Initializing the consumer messagor that will just not do anything....");
+        factory = new ActiveMQConnectionFactory();
+        factory.setBrokerURL("failover:("+connectionUri+"?wireFormat.maxInactivityDuration=30000&keepAlive=true&soTimeout=60000)?jms.watchTopicAdvisories=false&jms.useAsyncSend=false&jms.dispatchAsync=true&jms.producerWindowSize=10485760&jms.copyMessageOnSend=false&jms.disableTimeStampsByDefault=true&InitialReconnectDelay=1000&maxReconnectDelay=10000&maxReconnectAttempts=400&useExponentialBackOff=true");
+        connection = factory.createConnection();
+        connection.start();
+        sessionWithListener = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        destination = sessionWithListener.createQueue("EMPTY.QUEUE");
+    }
+
+    private void startConsumer() throws Exception {
+        logger.info("Starting the consumer");
+        consumer = sessionWithListener.createConsumer(destination);
+        consumer.setMessageListener(new MessageListener() {
+
+            @Override
+            public void onMessage(Message message) {
+                logger.info("Received a message: " + message);
+            }
+
+        });
+
+        thread = new Thread(new Runnable() {
+
+            private Session session;
+
+            @Override
+            public void run() {
+                try {
+                    destination = session.createQueue("EMPTY.QUEUE");
+                    MessageConsumer consumer = session.createConsumer(destination);
+                    for (int cnt = 0; cnt < 2; cnt++) {
+                        Message message = consumer.receive(50000);
+                        logger.info("Received message: " + message);
+                    }
+                } catch (JMSException e) {
+                    logger.debug("Received an exception while processing messages", e);
+                } finally {
+                    try {
+                        session.close();
+                    } catch (JMSException e) {
+                        logger.debug("Received an exception while closing session", e);
+                    }
+                }
+            }
+
+            public Runnable setSession(Session session) {
+                this.session = session;
+                return this;
+            }
+
+        }.setSession(session)) {
+            {
+                start();
+            }
+        };
+    }
+
+    private void stopConsumer() throws JMSException {
+        logger.info("Stopping the consumer");
+        try {
+            thread.join();
+        } catch (InterruptedException e) {
+            logger.debug("Received an exception while waiting for thread to complete", e);
+        }
+        if (sessionWithListener != null) {
+            sessionWithListener.close();
+        }
+        if (connection != null) {
+            connection.stop();
+        }
+    }
+
+    private void produceSingleMessage() throws JMSException {
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
+        factory.setBrokerURL(connectionUri);
+        Connection connection = factory.createConnection();
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Destination destination = session.createQueue("EMPTY.QUEUE");
+        MessageProducer producer = session.createProducer(destination);
+        producer.send(session.createTextMessage("Single Message"));
+        producer.close();
+        session.close();
+        connection.close();
+    }
+}