You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/08/21 19:57:53 UTC
[1/5] qpid-jms git commit: NO-JIRA: remove unused method
Repository: qpid-jms
Updated Branches:
refs/heads/master cfa2ca69d -> 80f33fc6a
NO-JIRA: remove unused method
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2d51c8c0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2d51c8c0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2d51c8c0
Branch: refs/heads/master
Commit: 2d51c8c0ee9257cfc29efe98a6bf2337b8717f9e
Parents: fe93f01
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Aug 21 13:11:47 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Aug 21 18:41:33 2015 +0100
----------------------------------------------------------------------
.../apache/qpid/jms/provider/amqp/AmqpAbstractResource.java | 5 -----
.../java/org/apache/qpid/jms/provider/amqp/AmqpResource.java | 6 ------
2 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2d51c8c0/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
index 76dad8b..e312b85 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
@@ -150,11 +150,6 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp
}
@Override
- public void failed() {
- failed(new JMSException("Remote request failed."));
- }
-
- @Override
public void failed(Exception cause) {
if (openRequest != null) {
if (endpoint != null) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2d51c8c0/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
index afea959..beabb07 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
@@ -80,12 +80,6 @@ public interface AmqpResource {
void closed();
/**
- * Sets the failed state for this Resource and triggers a failure signal for
- * any pending ProduverRequest.
- */
- void failed();
-
- /**
* Called to indicate that the remote end has become closed but the resource
* was not awaiting an open/close completion.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/5] qpid-jms git commit: QPIDJMS-95: if a [transport] failure is
reported while we are trying to open then fail the attempt to open the new
connection
Posted by ro...@apache.org.
QPIDJMS-95: if a [transport] failure is reported while we are trying to open then fail the attempt to open the new connection
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9aabc27a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9aabc27a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9aabc27a
Branch: refs/heads/master
Commit: 9aabc27a4de515377cd149c41b6983435a241e3d
Parents: e46354b
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Aug 21 17:29:13 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Aug 21 18:45:13 2015 +0100
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpProvider.java | 18 ++-
.../failover/FailoverIntegrationTest.java | 122 +++++++++++++++++++
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 11 ++
.../jms/test/testpeer/TestAmqpPeerRunner.java | 12 ++
4 files changed, 159 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9aabc27a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 3a2e709..7383352 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -126,6 +126,7 @@ public class AmqpProvider implements Provider, TransportListener {
private final Transport protonTransport = Transport.Factory.create();
private final Collector protonCollector = new CollectorImpl();
+ private AsyncResult connectionOpenRequest;
private ScheduledFuture<?> nextIdleTimeoutCheck;
/**
@@ -240,7 +241,6 @@ public class AmqpProvider implements Provider, TransportListener {
try {
checkClosed();
resource.visit(new JmsResourceVistor() {
-
@Override
public void processSessionInfo(JmsSessionInfo sessionInfo) throws Exception {
AmqpSession session = connection.createSession(sessionInfo);
@@ -296,8 +296,7 @@ public class AmqpProvider implements Provider, TransportListener {
}
connection = new AmqpConnection(AmqpProvider.this, protonConnection, authenticator, connectionInfo);
- connection.open(new AsyncResult() {
-
+ AsyncResult wrappedOpenRequest = new AsyncResult() {
@Override
public void onSuccess() {
fireConnectionEstablished();
@@ -313,7 +312,11 @@ public class AmqpProvider implements Provider, TransportListener {
public boolean isComplete() {
return request.isComplete();
}
- });
+ };
+
+ connectionOpenRequest = wrappedOpenRequest;
+
+ connection.open(wrappedOpenRequest);
}
@Override
@@ -838,6 +841,8 @@ public class AmqpProvider implements Provider, TransportListener {
}
void fireConnectionEstablished() {
+ //The request onSuccess calls this method
+ connectionOpenRequest = null;
long now = System.currentTimeMillis();
long deadline = protonTransport.tick(now);
@@ -854,6 +859,11 @@ public class AmqpProvider implements Provider, TransportListener {
}
void fireProviderException(Throwable ex) {
+ if(connectionOpenRequest != null) {
+ connectionOpenRequest.onFailure(ex);
+ connectionOpenRequest = null;
+ }
+
ProviderListener listener = this.listener;
if (listener != null) {
listener.onConnectionFailure(IOExceptionSupport.create(ex));
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9aabc27a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
new file mode 100644
index 0000000..6a086b3
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
@@ -0,0 +1,122 @@
+/**
+ * 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.qpid.jms.provider.failover;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+
+import org.apache.qpid.jms.JmsConnection;
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.apache.qpid.jms.JmsDefaultConnectionListener;
+import org.apache.qpid.jms.test.QpidJmsTestCase;
+import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FailoverIntegrationTest extends QpidJmsTestCase {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FailoverIntegrationTest.class);
+
+ @Test(timeout = 20000)
+ public void testFailoverHandlesImmediateTransportDropAfterConnect() throws Exception {
+ try (TestAmqpPeer originalPeer = new TestAmqpPeer();
+ TestAmqpPeer rejectingPeer = new TestAmqpPeer();
+ TestAmqpPeer finalPeer = new TestAmqpPeer();) {
+
+ final CountDownLatch originalConnected = new CountDownLatch(1);
+ final CountDownLatch finalConnected = new CountDownLatch(1);
+
+ // Create a peer to connect to, one to fail to reconnect to, and a final one to reconnect to
+ final String originalURI = createPeerURI(originalPeer);
+ final String rejectingURI = createPeerURI(rejectingPeer);
+ final String finalURI = createPeerURI(finalPeer);
+
+ LOG.info("Original peer is at: {}", originalURI);
+ LOG.info("Rejecting peer is at: {}", rejectingURI);
+ LOG.info("Final peer is at: {}", finalURI);
+
+ // Connect to the first
+ originalPeer.expectSaslAnonymousConnect();
+ originalPeer.expectBegin();
+
+ final JmsConnection connection = establishAnonymousConnecton(originalPeer, rejectingPeer, finalPeer);
+ connection.addConnectionListener(new JmsDefaultConnectionListener() {
+ @Override
+ public void onConnectionEstablished(URI remoteURI) {
+ LOG.info("Connection Established: {}", remoteURI);
+ if (originalURI.equals(remoteURI.toString())) {
+ originalConnected.countDown();
+ }
+ }
+
+ @Override
+ public void onConnectionRestored(URI remoteURI) {
+ LOG.info("Connection Restored: {}", remoteURI);
+ if (finalURI.equals(remoteURI.toString())) {
+ finalConnected.countDown();
+ }
+ }
+ });
+ connection.start();
+
+ assertTrue("Should connect to original peer", originalConnected.await(5, TimeUnit.SECONDS));
+ assertEquals("should not yet have connected to final peer", 1L, finalConnected.getCount());
+
+ // Set expectations on rejecting and final peer
+ rejectingPeer.expectSaslHeaderThenDrop();
+
+ finalPeer.expectSaslAnonymousConnect();
+ finalPeer.expectBegin();
+
+ // Close the original peer and wait for things to shake out.
+ originalPeer.close();
+
+ rejectingPeer.waitForAllHandlersToComplete(2000);
+
+ assertTrue("Should connect to final peer", finalConnected.await(5, TimeUnit.SECONDS));
+
+ //Shut it down
+ finalPeer.expectClose();
+ connection.close();
+ finalPeer.waitForAllHandlersToComplete(1000);
+ }
+ }
+
+ private JmsConnection establishAnonymousConnecton(TestAmqpPeer origPeer, TestAmqpPeer rejectingPeer, TestAmqpPeer finalPeer) throws JMSException {
+ final String remoteURI = "failover:(" + createPeerURI(origPeer) + ","
+ + createPeerURI(rejectingPeer) + ","
+ + createPeerURI(finalPeer) + ")";
+
+ ConnectionFactory factory = new JmsConnectionFactory(remoteURI);
+ Connection connection = factory.createConnection();
+
+ return (JmsConnection) connection;
+ }
+
+ private String createPeerURI(TestAmqpPeer peer) {
+ return "amqp://localhost:" + peer.getServerPort();
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9aabc27a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index 6f34ea5..62694d7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -1562,4 +1562,15 @@ public class TestAmqpPeer implements AutoCloseable
_firstAssertionError = ae;
}
}
+
+ public void expectSaslHeaderThenDrop() {
+ AmqpPeerRunnable exitAfterHeader = new AmqpPeerRunnable() {
+ @Override
+ public void run() {
+ _driverRunnable.exitReadLoopEarly();
+ }
+ };
+
+ addHandler(new HeaderHandlerImpl(AmqpHeader.SASL_HEADER, AmqpHeader.SASL_HEADER, exitAfterHeader));
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9aabc27a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java
index 17ec2f6..854e64c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java
@@ -48,6 +48,7 @@ class TestAmqpPeerRunner implements Runnable
private final Object _inputHandlingLock = new Object();
private final TestFrameParser _testFrameParser;
private volatile boolean _suppressReadExceptionOnClose;
+ private volatile boolean _exitReadLoopEarly;
private volatile Throwable _throwable;
@@ -108,6 +109,13 @@ class TestAmqpPeerRunner implements Runnable
_testFrameParser.input(networkInputByteBuffer);
}
+
+ if(_exitReadLoopEarly)
+ {
+ LOGGER.trace("Exiting read loop early");
+ break;
+ }
+
LOGGER.trace("Attempting read");
attemptingRead = true;
}
@@ -217,4 +225,8 @@ class TestAmqpPeerRunner implements Runnable
public boolean isNeedClientCert() {
return needClientCert;
}
+
+ public void exitReadLoopEarly() {
+ _exitReadLoopEarly = true;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/5] qpid-jms git commit: QPIDJMS-94: mark begin of connection close
and use to prevent new connection attempts after that point
Posted by ro...@apache.org.
QPIDJMS-94: mark begin of connection close and use to prevent new connection attempts after that point
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/fe93f010
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/fe93f010
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/fe93f010
Branch: refs/heads/master
Commit: fe93f01037825228deeda3f5ddfce001314f8c1f
Parents: cfa2ca6
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Aug 21 10:46:38 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Aug 21 18:41:33 2015 +0100
----------------------------------------------------------------------
.../jms/provider/failover/FailoverProvider.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fe93f010/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index eef6a9a..8fd44e6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -83,6 +83,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
private final ScheduledExecutorService connectionHub;
private final AtomicBoolean closed = new AtomicBoolean();
private final AtomicBoolean failed = new AtomicBoolean();
+ private final AtomicBoolean closingConnection = new AtomicBoolean(false);
private final AtomicLong requestId = new AtomicLong();
private final Map<Long, FailoverRequest> requests = new LinkedHashMap<Long, FailoverRequest>();
private final DefaultProviderListener closedListener = new DefaultProviderListener();
@@ -287,6 +288,9 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
final FailoverRequest pending = new FailoverRequest(request) {
@Override
public void doTask() throws IOException, JMSException, UnsupportedOperationException {
+ if(resourceId instanceof JmsConnectionInfo) {
+ closingConnection.set(true);
+ }
provider.destroy(resourceId, this);
}
@@ -594,14 +598,14 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
* point of view that connection was lost and an immediate attempt cycle should start.
*/
private void triggerReconnectionAttempt() {
- if (closed.get() || failed.get()) {
+ if (closingConnection.get() || closed.get() || failed.get()) {
return;
}
connectionHub.execute(new Runnable() {
@Override
public void run() {
- if (provider != null || closed.get() || failed.get()) {
+ if (provider != null || closingConnection.get() || closed.get() || failed.get()) {
return;
}
@@ -704,13 +708,13 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
@Override
public void onInboundMessage(final JmsInboundMessageDispatch envelope) {
- if (closed.get() || failed.get()) {
+ if (closingConnection.get() || closed.get() || failed.get()) {
return;
}
serializer.execute(new Runnable() {
@Override
public void run() {
- if (!closed.get()) {
+ if (!closingConnection.get() && !closed.get() && !failed.get()) {
listener.onInboundMessage(envelope);
}
}
@@ -719,13 +723,13 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
@Override
public void onConnectionFailure(final IOException ex) {
- if (closed.get() || failed.get()) {
+ if (closingConnection.get() || closed.get() || failed.get()) {
return;
}
serializer.execute(new Runnable() {
@Override
public void run() {
- if (!closed.get() && !failed.get()) {
+ if (!closingConnection.get() && !closed.get() && !failed.get()) {
LOG.debug("Failover: the provider reports failure: {}", ex.getMessage());
handleProviderFailure(ex);
}
@@ -929,7 +933,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
@Override
public void onFailure(final Throwable result) {
- if (closed.get() || failed.get()) {
+ if (closingConnection.get() || closed.get() || failed.get()) {
requests.remove(id);
super.onFailure(result);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/5] qpid-jms git commit: NO-JIRA: add some notes for later
Posted by ro...@apache.org.
NO-JIRA: add some notes for later
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/80f33fc6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/80f33fc6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/80f33fc6
Branch: refs/heads/master
Commit: 80f33fc6a7adeac17683d322acae2f9973dc4211
Parents: 9aabc27
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Aug 21 15:29:44 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Aug 21 18:46:29 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java | 3 +++
.../main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80f33fc6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 7383352..ff36ab3 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -189,6 +189,7 @@ public class AmqpProvider implements Provider, TransportListener {
// just signal success.
if (transport == null || !transport.isConnected()) {
request.onSuccess();
+ //TODO: return here? mark proton connection closed then return?
}
if (connection != null) {
@@ -217,6 +218,7 @@ public class AmqpProvider implements Provider, TransportListener {
}
} catch (IOException e) {
LOG.warn("Error caught while closing Provider: ", e.getMessage());
+ //TODO: message can be / seemingly usually is empty
} finally {
if (transport != null) {
try {
@@ -740,6 +742,7 @@ public class AmqpProvider implements Provider, TransportListener {
LOG.debug("Transport connection remotely closed");
if (!closed.get()) {
fireProviderException(new IOException("Transport connection remotely closed."));
+ //TODO: close the proton transport as well/instead?
if (connection != null) {
connection.closed();
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80f33fc6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
index 2dd72fb..46ff1bd 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
@@ -261,6 +261,7 @@ public class AmqpSession extends AmqpAbstractResource<JmsSessionInfo, Session> {
return false;
}
+ //TODO: unused?
/**
* Call to send an error that occurs outside of the normal asynchronous processing
* of a session resource such as a remote close etc.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/5] qpid-jms git commit: QPIDJMS-95: add some extra trace logging,
make exception message slightly clearer
Posted by ro...@apache.org.
QPIDJMS-95: add some extra trace logging, make exception message slightly clearer
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e46354bd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e46354bd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e46354bd
Branch: refs/heads/master
Commit: e46354bd724f10a6e670ebd821987b99cbf2e943
Parents: 2d51c8c
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Aug 21 15:28:04 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Aug 21 18:44:54 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java | 2 +-
.../org/apache/qpid/jms/transports/netty/NettyTcpTransport.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e46354bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 15c3cc2..3a2e709 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -736,7 +736,7 @@ public class AmqpProvider implements Provider, TransportListener {
public void run() {
LOG.debug("Transport connection remotely closed");
if (!closed.get()) {
- fireProviderException(new IOException("Connection remotely closed."));
+ fireProviderException(new IOException("Transport connection remotely closed."));
if (connection != null) {
connection.closed();
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e46354bd/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
index 08be1f7..8035161 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
@@ -294,6 +294,7 @@ public class NettyTcpTransport implements Transport {
LOG.trace("Channel has gone inactive! Channel is {}", context.channel());
if (!closed.get()) {
connected.set(false);
+ LOG.trace("Firing onTransportClosed listener");
listener.onTransportClosed();
}
}
@@ -303,6 +304,7 @@ public class NettyTcpTransport implements Transport {
LOG.trace("Exception on channel! Channel is {}", context.channel());
if (!closed.get()) {
connected.set(false);
+ LOG.trace("Firing onTransportError listener");
listener.onTransportError(cause);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org