Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-4769: Connection.close() should not throw exception if already closed according to JMS spec/javadoc.

This commit is contained in:
Claus Ibsen 2013-10-02 15:15:46 +02:00
parent 78a785eecc
commit 887ac0ba49
3 changed files with 179 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
View File

@ -563,7 +563,19 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
*/
@Override
public void stop() throws JMSException {
checkClosedOrFailed();
doStop(true);
}
/**
* @see #stop()
* @param checkClosed <tt>true</tt> to check for already closed and throw {@link java.lang.IllegalStateException} if already closed,
* <tt>false</tt> to skip this check
* @throws JMSException if the JMS provider fails to stop message delivery due to some internal error.
*/
void doStop(boolean checkClosed) throws JMSException {
if (checkClosed) {
checkClosedOrFailed();
}
if (started.compareAndSet(true, false)) {
synchronized(sessions) {
for (Iterator<ActiveMQSession> i = sessions.iterator(); i.hasNext();) {
@ -627,7 +639,9 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
// If we were running, lets stop first.
if (!closed.get() && !transportFailed.get()) {
stop();
// do not fail if already closed as according to JMS spec we must not
// throw exception if already closed
doStop(false);
}
synchronized (this) {

96
activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java Executable file
View File

@ -0,0 +1,96 @@
/**
* 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;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import javax.jms.JMSException;
import javax.jms.Session;
import junit.framework.TestCase;
/**
*
*/
public class ConnectionCloseMultipleTimesConcurrentTest extends TestCase {
private ActiveMQConnection connection;
private ExecutorService executor;
private int size = 200;
protected void setUp() throws Exception {
executor = Executors.newFixedThreadPool(20);
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
connection = (ActiveMQConnection)factory.createConnection();
connection.start();
}
/**
* @see junit.framework.TestCase#tearDown()
*/
protected void tearDown() throws Exception {
if (connection.isStarted()) {
connection.stop();
}
if (executor != null) {
executor.shutdownNow();
}
}
/**
* @throws javax.jms.JMSException
*/
public void testCloseMultipleTimes() throws Exception {
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
assertTrue(connection.isStarted());
assertFalse(connection.isClosed());
final CountDownLatch latch = new CountDownLatch(size);
for (int i = 0; i < size; i++) {
executor.submit(new Runnable() {
@Override
public void run() {
try {
connection.close();
assertFalse(connection.isStarted());
assertTrue(connection.isClosed());
latch.countDown();
} catch (JMSException e) {
// ignore
}
}
});
}
boolean zero = latch.await(20, TimeUnit.SECONDS);
assertTrue("Should complete all", zero);
// should not fail calling again
connection.close();
assertFalse(connection.isStarted());
assertTrue(connection.isClosed());
}
}

67
activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesTest.java Executable file
View File

@ -0,0 +1,67 @@
/**
* 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;
import javax.jms.JMSException;
import javax.jms.Session;
import junit.framework.TestCase;
/**
*
*/
public class ConnectionCloseMultipleTimesTest extends TestCase {
private ActiveMQConnection connection;
protected void setUp() throws Exception {
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
connection = (ActiveMQConnection)factory.createConnection();
connection.start();
}
/**
* @see junit.framework.TestCase#tearDown()
*/
protected void tearDown() throws Exception {
if (connection.isStarted()) {
connection.stop();
}
}
/**
* @throws javax.jms.JMSException
*/
public void testCloseMultipleTimes() throws JMSException {
connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
assertTrue(connection.isStarted());
assertFalse(connection.isClosed());
connection.close();
assertFalse(connection.isStarted());
assertTrue(connection.isClosed());
// should not fail calling again
connection.close();
assertFalse(connection.isStarted());
assertTrue(connection.isClosed());
}
}