You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/01/12 01:45:53 UTC
[1/3] activemq-artemis git commit: Remove DelegatingSession class
Repository: activemq-artemis
Updated Branches:
refs/heads/master c4837c2c3 -> 663f7f78f
Remove DelegatingSession class
DelegatingSession class wraps ClientSessionImpl and attempts to close
session should it not be closed by the user. It does this by
implementing finalize. However, the order in which finalize runs can be
difficult to predict as compilers, and JIT compilers are able to
optimize early.
The current DelegatingSession was causing problems of finalize getting
called early (before consumers, producers were finished with the
session). This was causing tests to fail on the IBM JDK (which
optimizes early). The same happens on OpenJDK if the GC is forced.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/945963ed
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/945963ed
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/945963ed
Branch: refs/heads/master
Commit: 945963ed07094723aa38e5f8f423572e0d82e9a3
Parents: c4837c2
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Jan 11 11:15:39 2016 +0000
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jan 11 19:43:10 2016 -0500
----------------------------------------------------------------------
.../client/impl/ClientSessionFactoryImpl.java | 6 +-
.../core/client/impl/DelegatingSession.java | 668 -------------------
.../failover/AsynchronousFailoverTest.java | 10 +-
.../tests/integration/jms/JmsProducerTest.java | 3 +-
4 files changed, 5 insertions(+), 682 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index 9df7ed4..135f172 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -38,10 +38,10 @@ import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
import org.apache.activemq.artemis.api.core.client.FailoverEventType;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
@@ -57,8 +57,8 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
import org.apache.activemq.artemis.spi.core.remoting.Connector;
import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory;
-import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
+import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.ConfirmationWindowWarning;
@@ -663,7 +663,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
sessions.add(session);
}
- return new DelegatingSession(session);
+ return session;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
deleted file mode 100644
index 087a150..0000000
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * 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.artemis.core.client.impl;
-
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.util.Set;
-
-import org.apache.activemq.artemis.api.core.ActiveMQException;
-import org.apache.activemq.artemis.api.core.Message;
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.client.ClientConsumer;
-import org.apache.activemq.artemis.api.core.client.ClientMessage;
-import org.apache.activemq.artemis.api.core.client.ClientProducer;
-import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
-import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
-import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
-import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
-import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
-import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
-import org.apache.activemq.artemis.utils.ConcurrentHashSet;
-
-/**
- * A DelegatingSession
- * <p>
- * We wrap the real session, so we can add a finalizer on this and close the session
- * on GC if it has not already been closed
- */
-public class DelegatingSession implements ClientSessionInternal {
-
- private final ClientSessionInternal session;
-
- private final Exception creationStack;
-
- private volatile boolean closed;
-
- private static Set<DelegatingSession> sessions = new ConcurrentHashSet<>();
-
- public static volatile boolean debug;
-
- public static void dumpSessionCreationStacks() {
- ActiveMQClientLogger.LOGGER.dumpingSessionStacks();
-
- for (DelegatingSession session : DelegatingSession.sessions) {
- ActiveMQClientLogger.LOGGER.dumpingSessionStack(session.creationStack);
- }
- }
-
- public ClientSessionInternal getInternalSession() {
- return session;
- }
-
- @Override
- protected void finalize() throws Throwable {
- // In some scenarios we have seen the JDK finalizing the DelegatingSession while the call to session.close() was still in progress
- //
- if (!closed && !session.isClosed()) {
- ActiveMQClientLogger.LOGGER.clientSessionNotClosed(creationStack, System.identityHashCode(this));
-
- close();
- }
-
- super.finalize();
- }
-
- public DelegatingSession(final ClientSessionInternal session) {
- this.session = session;
-
- creationStack = new Exception();
-
- if (DelegatingSession.debug) {
- DelegatingSession.sessions.add(this);
- }
- }
-
- @Override
- public boolean isClosing() {
- return session.isClosing();
- }
-
- @Override
- public void acknowledge(final ClientConsumer consumer, final Message message) throws ActiveMQException {
- session.acknowledge(consumer, message);
- }
-
- @Override
- public boolean isWritable(ReadyListener callback) {
- return session.isWritable(callback);
- }
-
- @Override
- public void individualAcknowledge(final ClientConsumer consumer, final Message message) throws ActiveMQException {
- session.individualAcknowledge(consumer, message);
- }
-
- @Override
- public void addConsumer(final ClientConsumerInternal consumer) {
- session.addConsumer(consumer);
- }
-
- @Override
- public void addFailureListener(final SessionFailureListener listener) {
- session.addFailureListener(listener);
- }
-
- @Override
- public void addFailoverListener(FailoverEventListener listener) {
- session.addFailoverListener(listener);
- }
-
- @Override
- public void addProducer(final ClientProducerInternal producer) {
- session.addProducer(producer);
- }
-
- @Override
- public AddressQuery addressQuery(final SimpleString address) throws ActiveMQException {
- return session.addressQuery(address);
- }
-
- @Override
- public void cleanUp(boolean failingOver) throws ActiveMQException {
- session.cleanUp(failingOver);
- }
-
- @Override
- public void close() throws ActiveMQException {
- closed = true;
-
- if (DelegatingSession.debug) {
- DelegatingSession.sessions.remove(this);
- }
-
- session.close();
- }
-
- @Override
- public void markRollbackOnly() {
- session.markRollbackOnly();
- }
-
- @Override
- public void commit() throws ActiveMQException {
- session.commit();
- }
-
- @Override
- public void commit(final Xid xid, final boolean onePhase) throws XAException {
- session.commit(xid, onePhase);
- }
-
- @Override
- public ClientMessage createMessage(final boolean durable) {
- return session.createMessage(durable);
- }
-
- @Override
- public ClientMessage createMessage(final byte type,
- final boolean durable,
- final long expiration,
- final long timestamp,
- final byte priority) {
- return session.createMessage(type, durable, expiration, timestamp, priority);
- }
-
- @Override
- public ClientMessage createMessage(final byte type, final boolean durable) {
- return session.createMessage(type, durable);
- }
-
- @Override
- public ClientConsumer createConsumer(final SimpleString queueName,
- final SimpleString filterString,
- final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, filterString, browseOnly);
- }
-
- @Override
- public ClientConsumer createConsumer(final SimpleString queueName,
- final SimpleString filterString,
- final int windowSize,
- final int maxRate,
- final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, filterString, windowSize, maxRate, browseOnly);
- }
-
- @Override
- public ClientConsumer createConsumer(final SimpleString queueName,
- final SimpleString filterString) throws ActiveMQException {
- return session.createConsumer(queueName, filterString);
- }
-
- @Override
- public ClientConsumer createConsumer(final SimpleString queueName) throws ActiveMQException {
- return session.createConsumer(queueName);
- }
-
- @Override
- public ClientConsumer createConsumer(final String queueName,
- final String filterString,
- final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, filterString, browseOnly);
- }
-
- @Override
- public ClientConsumer createConsumer(final String queueName,
- final String filterString,
- final int windowSize,
- final int maxRate,
- final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, filterString, windowSize, maxRate, browseOnly);
- }
-
- @Override
- public ClientConsumer createConsumer(final String queueName, final String filterString) throws ActiveMQException {
- return session.createConsumer(queueName, filterString);
- }
-
- @Override
- public ClientConsumer createConsumer(final String queueName) throws ActiveMQException {
- return session.createConsumer(queueName);
- }
-
- @Override
- public ClientConsumer createConsumer(final SimpleString queueName,
- final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, browseOnly);
- }
-
- @Override
- public ClientConsumer createConsumer(final String queueName, final boolean browseOnly) throws ActiveMQException {
- return session.createConsumer(queueName, browseOnly);
- }
-
- @Override
- public ClientProducer createProducer() throws ActiveMQException {
- return session.createProducer();
- }
-
- @Override
- public ClientProducer createProducer(final SimpleString address, final int rate) throws ActiveMQException {
- return session.createProducer(address, rate);
- }
-
- @Override
- public ClientProducer createProducer(final SimpleString address) throws ActiveMQException {
- return session.createProducer(address);
- }
-
- @Override
- public ClientProducer createProducer(final String address) throws ActiveMQException {
- return session.createProducer(address);
- }
-
- @Override
- public void createQueue(final String address, final String queueName) throws ActiveMQException {
- session.createQueue(address, queueName);
- }
-
- @Override
- public void createQueue(final SimpleString address, final SimpleString queueName) throws ActiveMQException {
- session.createQueue(address, queueName);
- }
-
- @Override
- public void createQueue(final SimpleString address,
- final SimpleString queueName,
- final boolean durable) throws ActiveMQException {
- session.createQueue(address, queueName, durable);
- }
-
- @Override
- public void createSharedQueue(SimpleString address,
- SimpleString queueName,
- boolean durable) throws ActiveMQException {
- session.createSharedQueue(address, queueName, durable);
- }
-
- @Override
- public void createSharedQueue(SimpleString address,
- SimpleString queueName,
- SimpleString filter,
- boolean durable) throws ActiveMQException {
- session.createSharedQueue(address, queueName, filter, durable);
- }
-
- @Override
- public void createQueue(final SimpleString address,
- final SimpleString queueName,
- final SimpleString filterString,
- final boolean durable) throws ActiveMQException {
- session.createQueue(address, queueName, filterString, durable);
- }
-
- @Override
- public void createQueue(final String address,
- final String queueName,
- final boolean durable) throws ActiveMQException {
- session.createQueue(address, queueName, durable);
- }
-
- @Override
- public void createQueue(final String address,
- final String queueName,
- final String filterString,
- final boolean durable) throws ActiveMQException {
- session.createQueue(address, queueName, filterString, durable);
- }
-
- @Override
- public void createTemporaryQueue(final SimpleString address,
- final SimpleString queueName,
- final SimpleString filter) throws ActiveMQException {
- session.createTemporaryQueue(address, queueName, filter);
- }
-
- @Override
- public void createTemporaryQueue(final SimpleString address, final SimpleString queueName) throws ActiveMQException {
- session.createTemporaryQueue(address, queueName);
- }
-
- @Override
- public void createTemporaryQueue(final String address,
- final String queueName,
- final String filter) throws ActiveMQException {
- session.createTemporaryQueue(address, queueName, filter);
- }
-
- @Override
- public void createTemporaryQueue(final String address, final String queueName) throws ActiveMQException {
- session.createTemporaryQueue(address, queueName);
- }
-
- @Override
- public void deleteQueue(final SimpleString queueName) throws ActiveMQException {
- session.deleteQueue(queueName);
- }
-
- @Override
- public void deleteQueue(final String queueName) throws ActiveMQException {
- session.deleteQueue(queueName);
- }
-
- @Override
- public void end(final Xid xid, final int flags) throws XAException {
- session.end(xid, flags);
- }
-
- @Override
- public void expire(final ClientConsumer consumer, final Message message) throws ActiveMQException {
- session.expire(consumer, message);
- }
-
- @Override
- public void forget(final Xid xid) throws XAException {
- session.forget(xid);
- }
-
- @Override
- public RemotingConnection getConnection() {
- return session.getConnection();
- }
-
- @Override
- public int getMinLargeMessageSize() {
- return session.getMinLargeMessageSize();
- }
-
- @Override
- public String getName() {
- return session.getName();
- }
-
- @Override
- public int getTransactionTimeout() throws XAException {
- return session.getTransactionTimeout();
- }
-
- @Override
- public int getVersion() {
- return session.getVersion();
- }
-
- @Override
- public XAResource getXAResource() {
- return session.getXAResource();
- }
-
- @Override
- public void preHandleFailover(RemotingConnection connection) {
- session.preHandleFailover(connection);
- }
-
- @Override
- public void handleFailover(final RemotingConnection backupConnection, ActiveMQException cause) {
- session.handleFailover(backupConnection, cause);
- }
-
- @Override
- public void handleReceiveMessage(ConsumerContext consumerID, ClientMessageInternal message) throws Exception {
- session.handleReceiveMessage(consumerID, message);
- }
-
- @Override
- public void handleReceiveLargeMessage(ConsumerContext consumerID,
- ClientLargeMessageInternal clientLargeMessage,
- long largeMessageSize) throws Exception {
- session.handleReceiveLargeMessage(consumerID, clientLargeMessage, largeMessageSize);
- }
-
- @Override
- public void handleReceiveContinuation(ConsumerContext consumerID,
- byte[] chunk,
- int flowControlSize,
- boolean isContinues) throws Exception {
- session.handleReceiveContinuation(consumerID, chunk, flowControlSize, isContinues);
- }
-
- @Override
- public void handleConsumerDisconnect(ConsumerContext consumerContext) throws ActiveMQException {
- session.handleConsumerDisconnect(consumerContext);
- }
-
- @Override
- public boolean isAutoCommitAcks() {
- return session.isAutoCommitAcks();
- }
-
- @Override
- public boolean isAutoCommitSends() {
- return session.isAutoCommitSends();
- }
-
- @Override
- public boolean isBlockOnAcknowledge() {
- return session.isBlockOnAcknowledge();
- }
-
- @Override
- public boolean isCacheLargeMessageClient() {
- return session.isCacheLargeMessageClient();
- }
-
- @Override
- public boolean isClosed() {
- return session.isClosed();
- }
-
- @Override
- public boolean isSameRM(final XAResource xares) throws XAException {
- return session.isSameRM(xares);
- }
-
- @Override
- public boolean isXA() {
- return session.isXA();
- }
-
- @Override
- public int prepare(final Xid xid) throws XAException {
- return session.prepare(xid);
- }
-
- @Override
- public QueueQuery queueQuery(final SimpleString queueName) throws ActiveMQException {
- return session.queueQuery(queueName);
- }
-
- @Override
- public Xid[] recover(final int flag) throws XAException {
- return session.recover(flag);
- }
-
- @Override
- public void removeConsumer(final ClientConsumerInternal consumer) throws ActiveMQException {
- session.removeConsumer(consumer);
- }
-
- @Override
- public boolean removeFailureListener(final SessionFailureListener listener) {
- return session.removeFailureListener(listener);
- }
-
- @Override
- public boolean removeFailoverListener(FailoverEventListener listener) {
- return session.removeFailoverListener(listener);
- }
-
- @Override
- public void removeProducer(final ClientProducerInternal producer) {
- session.removeProducer(producer);
- }
-
- @Override
- public void rollback() throws ActiveMQException {
- session.rollback();
- }
-
- @Override
- public boolean isRollbackOnly() {
- return session.isRollbackOnly();
- }
-
- @Override
- public void rollback(final boolean considerLastMessageAsDelivered) throws ActiveMQException {
- session.rollback(considerLastMessageAsDelivered);
- }
-
- @Override
- public void rollback(final Xid xid) throws XAException {
- session.rollback(xid);
- }
-
- @Override
- public DelegatingSession setSendAcknowledgementHandler(final SendAcknowledgementHandler handler) {
- session.setSendAcknowledgementHandler(handler);
- return this;
- }
-
- @Override
- public boolean setTransactionTimeout(final int seconds) throws XAException {
- return session.setTransactionTimeout(seconds);
- }
-
- @Override
- public void resetIfNeeded() throws ActiveMQException {
- session.resetIfNeeded();
- }
-
- @Override
- public DelegatingSession start() throws ActiveMQException {
- session.start();
- return this;
- }
-
- @Override
- public void start(final Xid xid, final int flags) throws XAException {
- session.start(xid, flags);
- }
-
- @Override
- public void stop() throws ActiveMQException {
- session.stop();
- }
-
- @Override
- public ClientSessionFactory getSessionFactory() {
- return session.getSessionFactory();
- }
-
- @Override
- public void setForceNotSameRM(final boolean force) {
- session.setForceNotSameRM(force);
- }
-
- @Override
- public void workDone() {
- session.workDone();
- }
-
- @Override
- public void sendProducerCreditsMessage(final int credits, final SimpleString address) {
- session.sendProducerCreditsMessage(credits, address);
- }
-
- @Override
- public ClientProducerCredits getCredits(final SimpleString address, final boolean anon) {
- return session.getCredits(address, anon);
- }
-
- @Override
- public void returnCredits(final SimpleString address) {
- session.returnCredits(address);
- }
-
- @Override
- public void handleReceiveProducerCredits(final SimpleString address, final int credits) {
- session.handleReceiveProducerCredits(address, credits);
- }
-
- @Override
- public void handleReceiveProducerFailCredits(final SimpleString address, final int credits) {
- session.handleReceiveProducerFailCredits(address, credits);
- }
-
- @Override
- public ClientProducerCreditManager getProducerCreditManager() {
- return session.getProducerCreditManager();
- }
-
- @Override
- public void setAddress(Message message, SimpleString address) {
- session.setAddress(message, address);
- }
-
- @Override
- public void setPacketSize(int packetSize) {
- session.setPacketSize(packetSize);
- }
-
- @Override
- public void addMetaData(String key, String data) throws ActiveMQException {
- session.addMetaData(key, data);
- }
-
- @Override
- public boolean isCompressLargeMessages() {
- return session.isCompressLargeMessages();
- }
-
- @Override
- public String toString() {
- return "DelegatingSession [session=" + session + "]";
- }
-
- @Override
- public void addUniqueMetaData(String key, String data) throws ActiveMQException {
- session.addUniqueMetaData(key, data);
-
- }
-
- @Override
- public void startCall() {
- session.startCall();
- }
-
- @Override
- public void endCall() {
- session.endCall();
- }
-
- @Override
- public void setStopSignal() {
- session.setStopSignal();
- }
-
- @Override
- public boolean isConfirmationWindowEnabled() {
- return session.isConfirmationWindowEnabled();
- }
-
- @Override
- public void scheduleConfirmation(SendAcknowledgementHandler handler, Message msg) {
- session.scheduleConfirmation(handler, msg);
- }
-
- @Override
- public String getNodeId() {
- return session.getNodeId();
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index d21bd84..eb4ebe8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -33,11 +33,10 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientProducer;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.junit.Assert;
@@ -138,8 +137,6 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
private void runTest(final TestRunner runnable) throws Throwable {
final int numIts = 1;
- DelegatingSession.debug = true;
-
try {
for (int i = 0; i < numIts; i++) {
AsynchronousFailoverTest.log.info("Iteration " + i);
@@ -197,10 +194,6 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
createSession.close();
- if (sf.numSessions() != 0) {
- DelegatingSession.dumpSessionCreationStacks();
- }
-
Assert.assertEquals(0, sf.numSessions());
locator.close();
@@ -220,7 +213,6 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
}
}
finally {
- DelegatingSession.debug = false;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
index 5e237c2..7cf4f18 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
@@ -28,7 +28,6 @@ import java.util.Random;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.client.impl.ClientSessionImpl;
-import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
import org.apache.activemq.artemis.jms.client.ActiveMQJMSContext;
import org.apache.activemq.artemis.jms.client.ActiveMQSession;
import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
@@ -109,7 +108,7 @@ public class JmsProducerTest extends JMSTestBase {
ActiveMQSession sessionUsed = (ActiveMQSession) (((ActiveMQJMSContext) context).getUsedSession());
- ClientSessionImpl coreSession = (ClientSessionImpl) ((DelegatingSession) sessionUsed.getCoreSession()).getInternalSession();
+ ClientSessionImpl coreSession = (ClientSessionImpl) sessionUsed.getCoreSession();
// JMSConsumer is supposed to cache the producer, each call to createProducer is supposed to always return the same producer
assertEquals(1, coreSession.cloneProducers().size());
[2/3] activemq-artemis git commit: remove now invalid tests
Posted by cl...@apache.org.
remove now invalid tests
Since we are removing the finalize cleanup these tests are now invalid
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d9ac06a9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d9ac06a9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d9ac06a9
Branch: refs/heads/master
Commit: d9ac06a9074b218387f6c4de7fab4e1d0b81f600
Parents: 945963e
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jan 11 19:41:21 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jan 11 19:43:31 2016 -0500
----------------------------------------------------------------------
.../client/SessionCloseOnGCTest.java | 48 --------------------
1 file changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d9ac06a9/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
index 3f25a47..2f97e32 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
@@ -176,52 +176,4 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase {
locator = null;
ActiveMQTestBase.checkWeakReferences(fref);
}
-
- @Test
- public void testCloseOneSessionOnGC() throws Exception {
- ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) locator.createSessionFactory();
-
- {
- ClientSession session = sf.createSession(false, true, true);
-
- Assert.assertEquals(1, server.getRemotingService().getConnections().size());
- }
-
- for (int i = 0; i < 1000 && sf.numSessions() != 0; i++) {
- forceGC();
- }
-
- Assert.assertEquals(0, sf.numSessions());
- Assert.assertEquals(1, sf.numConnections());
- Assert.assertEquals(1, server.getRemotingService().getConnections().size());
- }
-
- @Test
- public void testCloseSeveralSessionOnGC() throws Exception {
- ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) locator.createSessionFactory();
-
- ClientSession session1 = sf.createSession(false, true, true);
- ClientSession session2 = sf.createSession(false, true, true);
- ClientSession session3 = sf.createSession(false, true, true);
-
- Assert.assertEquals(1, server.getRemotingService().getConnections().size());
-
- WeakReference<ClientSession> ref1 = new WeakReference<>(session1);
- WeakReference<ClientSession> ref2 = new WeakReference<>(session2);
- WeakReference<ClientSession> ref3 = new WeakReference<>(session3);
-
- session1 = null;
- session2 = null;
- session3 = null;
-
- ActiveMQTestBase.checkWeakReferences(ref1, ref2, ref3);
-
- for (int i = 0; i < 1000 && sf.numSessions() != 0; i++) {
- forceGC();
- }
- Assert.assertEquals("# sessions", 0, sf.numSessions());
- Assert.assertEquals("# connections", 1, sf.numConnections());
- Assert.assertEquals("# connections in remoting service", 1, server.getRemotingService().getConnections().size());
- }
-
}
[3/3] activemq-artemis git commit: This closes #308
Posted by cl...@apache.org.
This closes #308
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/663f7f78
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/663f7f78
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/663f7f78
Branch: refs/heads/master
Commit: 663f7f78f2e8f1b0f54c5f49c9812e0bb32ed72c
Parents: c4837c2 d9ac06a
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jan 11 19:45:37 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jan 11 19:45:37 2016 -0500
----------------------------------------------------------------------
.../client/impl/ClientSessionFactoryImpl.java | 6 +-
.../core/client/impl/DelegatingSession.java | 668 -------------------
.../client/SessionCloseOnGCTest.java | 48 --
.../failover/AsynchronousFailoverTest.java | 10 +-
.../tests/integration/jms/JmsProducerTest.java | 3 +-
5 files changed, 5 insertions(+), 730 deletions(-)
----------------------------------------------------------------------