You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/03/16 16:07:47 UTC

[2/2] activemq-artemis git commit: This closes #422

This closes #422


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ab98eb96
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ab98eb96
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ab98eb96

Branch: refs/heads/master
Commit: ab98eb9620bb5e53abf223e622fac2919b2808a7
Parents: ca19abb ee6a032
Author: jbertram <jb...@apache.org>
Authored: Wed Mar 16 10:06:24 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed Mar 16 10:06:24 2016 -0500

----------------------------------------------------------------------
 .../activemq/artemis/utils/PendingTask.java     |  27 +++++
 .../protocol/proton/ProtonProtocolManager.java  |   2 +-
 .../plug/ProtonSessionIntegrationCallback.java  | 101 +++++++++++++------
 .../core/protocol/mqtt/MQTTSessionCallback.java |   6 ++
 .../openwire/amq/AMQServerConsumer.java         |   6 +-
 .../protocol/openwire/amq/AMQServerSession.java |   2 +-
 .../core/protocol/openwire/amq/AMQSession.java  |   5 +
 .../plug/AMQPConnectionContextFactory.java      |   4 +-
 .../plug/context/AbstractConnectionContext.java |  11 +-
 .../client/ProtonClientConnectionContext.java   |   8 +-
 .../ProtonClientConnectionContextFactory.java   |   8 +-
 .../server/ProtonServerConnectionContext.java   |   8 +-
 .../ProtonServerConnectionContextFactory.java   |   8 +-
 .../org/proton/plug/handler/ProtonHandler.java  |   9 +-
 .../plug/handler/impl/ProtonHandlerImpl.java    |  30 +++---
 .../context/AbstractConnectionContextTest.java  |   4 +-
 .../plug/test/invm/InVMTestConnector.java       |   4 +-
 .../proton/plug/test/invm/ProtonINVMSPI.java    |   2 +-
 .../test/minimalclient/SimpleAMQPConnector.java |   3 +-
 .../plug/test/minimalserver/MinimalServer.java  |   3 +-
 .../core/protocol/stomp/StompSession.java       |  32 +++++-
 .../protocol/core/impl/CoreSessionCallback.java |   6 ++
 .../core/server/ActiveMQServerLogger.java       |   5 +-
 .../core/server/impl/ServerConsumerImpl.java    |  66 +++++++++---
 .../core/server/impl/ServerSessionImpl.java     |   2 +-
 .../spi/core/protocol/SessionCallback.java      |   4 +
 .../integration/client/HangConsumerTest.java    |   5 +
 .../tests/integration/proton/ProtonTest.java    |   6 +-
 28 files changed, 270 insertions(+), 107 deletions(-)
----------------------------------------------------------------------